diff --git a/deployment/check/data-model-ssh/nixosTest.nix b/deployment/check/data-model-ssh/nixosTest.nix
index 0e129493..b3c3aedc 100644
--- a/deployment/check/data-model-ssh/nixosTest.nix
+++ b/deployment/check/data-model-ssh/nixosTest.nix
@@ -10,10 +10,7 @@ let
     inherit pathToRoot pathFromRoot;
     nodeName = "ssh";
     targetSystem = system;
-    sshOpts = [
-      "ConnectTimeout=1"
-      "ServerAliveInterval=1"
-    ];
+    sshOpts = [ ];
   };
   deploy =
     (import ../common/data-model.nix {
diff --git a/deployment/check/data-model-tf/nixosTest.nix b/deployment/check/data-model-tf/nixosTest.nix
index 18965d1d..40467dba 100644
--- a/deployment/check/data-model-tf/nixosTest.nix
+++ b/deployment/check/data-model-tf/nixosTest.nix
@@ -10,10 +10,7 @@ let
     inherit pathToRoot pathFromRoot;
     nodeName = "target";
     targetSystem = system;
-    sshOpts = [
-      "ConnectTimeout=1"
-      "ServerAliveInterval=1"
-    ];
+    sshOpts = [ ];
   };
   deploy =
     (import ../common/data-model.nix {
diff --git a/deployment/run/ssh-single-host/run.sh b/deployment/run/ssh-single-host/run.sh
index 058f8267..a0662b4c 100755
--- a/deployment/run/ssh-single-host/run.sh
+++ b/deployment/run/ssh-single-host/run.sh
@@ -39,7 +39,7 @@ NIX_SSHOPTS="${sshOpts[*]}" nix-copy-closure --to "$destination" "$outPath" --gz
 # shellcheck disable=SC2029
 ssh "${sshOpts[@]}" "$destination" "nix-env --profile /nix/var/nix/profiles/system --set $outPath"
 # shellcheck disable=SC2029
-output=$(ssh "${sshOpts[@]}" "$destination" "nohup $outPath/bin/switch-to-configuration switch &" 2>&1) || echo "status code: $?"
+output=$(ssh -o "ConnectTimeout=1" -o "ServerAliveInterval=1" "${sshOpts[@]}" "$destination" "nohup $outPath/bin/switch-to-configuration switch &" 2>&1) || echo "status code: $?"
 echo "output: $output"
 if [[ $output != *"Timeout, server $host not responding"* ]]; then
   echo "non-timeout error: $output"