diff --git a/server/src/services/idleService/actions.js b/server/src/services/idleService/actions.js
index 4262ee3c..d03ac590 100644
--- a/server/src/services/idleService/actions.js
+++ b/server/src/services/idleService/actions.js
@@ -84,7 +84,7 @@ async function raiseLift() {
 
 const idleActions = [
   turnOffRoomControls,
-  dockAllRovers,
+  // dockAllRovers,
   disableAllRoverNightVision,
   sendNeatoHome,
   raiseLift,
diff --git a/server/src/services/liftService/index.js b/server/src/services/liftService/index.js
index cdaabf94..b8f27d1d 100644
--- a/server/src/services/liftService/index.js
+++ b/server/src/services/liftService/index.js
@@ -21,8 +21,8 @@ const liftConfig = haConfig.lift || {};
 
 const upSwitchId = String(liftConfig.upSwitch || '').trim();
 const downSwitchId = String(liftConfig.downSwitch || '').trim();
-const interlockMs = Math.max(250, Number(liftConfig.interlockMs) || 4000);
-const commandCooldownMs = Math.max(interlockMs, Number(liftConfig.commandCooldownMs) || 3000);
+const interlockMs = Math.max(250, Number(liftConfig.interlockMs) || 9000);
+const commandCooldownMs = Math.max(interlockMs, Number(liftConfig.commandCooldownMs) || 15000);
 
 const state = {
   busy: false,