4 files changed, 6 insertions, 6 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RunId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/RunId.java
index d78dbd6e636..d78dbd6e636 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RunId.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/RunId.java
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index 57708bfc89c..d3aa051088c 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -599,7 +599,7 @@ public class ApplicationController {
      * and store the application, and finally release (close) the lock.
      */
     Lock lock(ApplicationId application) {
-        return curator.lock(application, Duration.ofMinutes(10));
+        return curator.lock(application));
     }
 
     /** Verify that each of the production zones listed in the deployment spec exist in this system. */
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
index 2e8fe795fb5..bd746a2fa8d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
@@ -203,7 +203,7 @@ public class TenantController {
      * and store the tenant, and finally release (close) the lock.
      */
     private Lock lock(TenantName tenant) {
-        return curator.lock(tenant, Duration.ofMinutes(10));
+        return curator.lock(tenant);
     }
 
     private static boolean inDomain(Tenant tenant, AthenzDomain domain) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
index 09daaef2af6..22a6233ebe3 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
@@ -95,12 +95,12 @@ public class CuratorDb {
         return lock;
     }
 
-    public Lock lock(TenantName name, Duration timeout) {
-        return lock(lockPath(name), timeout);
+    public Lock lock(TenantName name) {
+        return lock(lockPath(name), defaultLockTimeout.multipliedBy(2));
     }
 
-    public Lock lock(ApplicationId id, Duration timeout) {
-        return lock(lockPath(id), timeout);
+    public Lock lock(ApplicationId id) {
+        return lock(lockPath(id), defaultLockTimeout.multipliedBy(2));
     }
 
     public Lock lockRotations() {