diff --git a/home-manager/modules/ssh/default.nix b/home-manager/modules/ssh/default.nix
index 0d89874..7d9d764 100644
--- a/home-manager/modules/ssh/default.nix
+++ b/home-manager/modules/ssh/default.nix
@@ -15,6 +15,7 @@ in
     programs.ssh = {
       enable = true;
       hashKnownHosts = true;
+      controlPath = "~/.ssh/master-%r@%n:%p";
       matchBlocks = {
         "*" = {
           identityFile = if var.workSystem then horusKey else personalKey;
@@ -77,6 +78,10 @@ in
 
         "repohost.bedum.horus.nu" = {
           forwardAgent = true;
+          extraOptions = {
+            ControlMaster = "auto";
+            ControlPersist = "10m";
+          };
         };
 
         "gitea.bedum.horus.nu" = {