diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,8 @@
   during execution.
 - Cases where there are no keys to deploy, such as having 0 keys or filtered
   keys, the "Key" step will not be planned when it previously would have.
+- Changed non-interactive SSH executed commands to use `BatchMode=yes` instead
+  of using `PasswordAuthentication=no` and `KbdInteractiveAuthentication=no`.
 
 ### Fixed
 
diff --git a/crates/core/src/hive/node.rs b/crates/core/src/hive/node.rs
--- a/crates/core/src/hive/node.rs
+++ b/crates/core/src/hive/node.rs
@@ -89,8 +89,7 @@
             .to_string(),
         ];
 
-        options.extend(["PasswordAuthentication=no".to_string()]);
-        options.extend(["KbdInteractiveAuthentication=no".to_string()]);
+        options.extend(["BatchMode=yes".to_string()]);
 
         vector.push("-o".to_string());
         vector.extend(options.into_iter().intersperse("-o".to_string()));
@@ -351,9 +350,7 @@
             "-o".to_string(),
             "StrictHostKeyChecking=accept-new".to_string(),
             "-o".to_string(),
-            "PasswordAuthentication=no".to_string(),
-            "-o".to_string(),
-            "KbdInteractiveAuthentication=no".to_string(),
+            "BatchMode=yes".to_string(),
         ];
 
         assert_eq!(target.create_ssh_args(subcommand_modifiers).unwrap(), args);
@@ -372,9 +369,7 @@
                 "-o".to_string(),
                 "StrictHostKeyChecking=accept-new".to_string(),
                 "-o".to_string(),
-                "PasswordAuthentication=no".to_string(),
-                "-o".to_string(),
-                "KbdInteractiveAuthentication=no".to_string(),
+                "BatchMode=yes".to_string(),
             ]
         );
 
@@ -388,9 +383,7 @@
                 "-o".to_string(),
                 "StrictHostKeyChecking=accept-new".to_string(),
                 "-o".to_string(),
-                "PasswordAuthentication=no".to_string(),
-                "-o".to_string(),
-                "KbdInteractiveAuthentication=no".to_string(),
+                "BatchMode=yes".to_string(),
             ]
         );