diff --git a/lib/backend.py b/lib/backend.py
index 5c8227c9c06462b216493a485bc9ea046ae1c00f..474fc815a0661d51d97c3eed21a7002b00c03770 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -49,7 +49,7 @@ def _GetConfig():
 
 
 def _GetSshRunner():
-  return ssh.SshRunner(_GetConfig())
+  return ssh.SshRunner(_GetConfig().GetClusterName())
 
 
 def _CleanDirectory(path, exclude=[]):
diff --git a/lib/bootstrap.py b/lib/bootstrap.py
index 43a7f4f40ca979cd3a66cfe4c1d8c2dc3308998a..2dfb1fa74646cfe52489d5eac18ba9c68b713c4f 100644
--- a/lib/bootstrap.py
+++ b/lib/bootstrap.py
@@ -264,7 +264,7 @@ def SetupNodeDaemon(node, ssh_key_check):
 
   """
   cfg = ssconf.SimpleConfigReader()
-  sshrunner = ssh.SshRunner(cfg)
+  sshrunner = ssh.SshRunner(cfg.GetClusterName())
   gntpass = utils.GetNodeDaemonPassword()
   if not re.match('^[a-zA-Z0-9.]{1,64}$', gntpass):
     raise errors.OpExecError("ganeti password corruption detected")
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 038f5a27a3adf6b647b091e0a17a5294cb8fc5ab..a91ca23d1f3a91edfd73b425e9c0c4cefd7dc6a7 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -108,7 +108,7 @@ class LogicalUnit(object):
 
     """
     if not self.__ssh:
-      self.__ssh = ssh.SshRunner(self.cfg)
+      self.__ssh = ssh.SshRunner(self.cfg.GetClusterName())
     return self.__ssh
 
   ssh = property(fget=__GetSSH)