diff --git a/lib/bootstrap.py b/lib/bootstrap.py
index f909299719ee6eda32f03af59c92c0e8e149e31e..6ebb7c8df679195e8a4cd24ee6707a7f809b5ad1 100644
--- a/lib/bootstrap.py
+++ b/lib/bootstrap.py
@@ -288,7 +288,9 @@ def RunNodeSetupCmd(cluster_name, node, basecmd, debug, verbose,
   if verbose:
     cmd.append("--verbose")
 
-  srun = ssh.SshRunner(cluster_name)
+  family = ssconf.SimpleStore().GetPrimaryIPFamily()
+  srun = ssh.SshRunner(cluster_name,
+                       ipv6=(family == netutils.IP6Address.family))
   scmd = srun.BuildCmd(node, constants.SSH_LOGIN_USER,
                        utils.ShellQuoteArgs(cmd),
                        batch=False, ask_key=ask_key, quiet=False,