diff --git a/modules/ssh.nix b/modules/ssh.nix
index dc203e52..c869fa24 100644
--- a/modules/ssh.nix
+++ b/modules/ssh.nix
@@ -16,7 +16,7 @@ let
     programs.ssh = {
       enable = true;
       compression = true;
-      controlMaster = "yes";
+      controlMaster = "auto";
       controlPersist = "10m";
       hashKnownHosts = true;
       userKnownHostsFile = "${config.chvp.cachePrefix}${home}/.ssh/known_hosts";