1 files changed, 3 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeScheduler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeScheduler.java
index 644a8c6c1ed..5fa90d98c18 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeScheduler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeScheduler.java
@@ -62,9 +62,10 @@ public class OsUpgradeScheduler extends ControllerMaintainer {
         } else if (!wantedVersion.isAfter(currentVersion)) {
             return Optional.empty(); // No change right now, and we cannot predict the next change for this kind of release
         }
-        // Find trigger time
+        // Find the earliest possible trigger time on this day
+        instant = instant.truncatedTo(ChronoUnit.DAYS);
         while (!canTriggerAt(instant)) {
-            instant = instant.truncatedTo(ChronoUnit.HOURS).plus(Duration.ofHours(1));
+            instant = instant.plus(Duration.ofHours(1));
         }
         return Optional.of(new Change(wantedVersion, release.upgradeBudget(), instant));
     }