diff --git a/homeManagerModules/ssh.nix b/homeManagerModules/ssh.nix
index 44ab243..0010d2f 100644
--- a/homeManagerModules/ssh.nix
+++ b/homeManagerModules/ssh.nix
@@ -2,16 +2,29 @@
 {
   programs.ssh = lib.mkIf config.ssh {
     enable = true;
+    enableDefaultConfig = false;
     extraConfig = ''
       SetEnv TERM="xterm-256color"
       ${lib.optionalString config._1password "IdentityAgent ~/.1password/agent.sock"}
     '';
     matchBlocks = lib.mkMerge [
+      {
+        "*" = {
+          user = "john";
+          forwardAgent = true;
+          serverAliveInterval = 60;
+          serverAliveCountMax = 2;
+        };
+      }
       (lib.mkIf (config.profile == "personal") {
         "ad-nix" = {
           hostname = "192.168.1.201";
           user = "appdaemon";
         };
+        "appdaemon" = {
+          hostname = "192.168.1.242";
+          user = "appdaemon";
+        };
         "docs" = {
           hostname = "192.168.1.110";
           user = "root";
@@ -28,6 +41,10 @@
           hostname = "192.168.1.107";
           user = "root";
         };
+        "platform-caddy" = {
+          hostname = "192.168.1.65";
+          user = "root";
+        };
         "pve5070" = {
           hostname = "192.168.1.130";
           user = "root";
@@ -36,6 +53,10 @@
           hostname = "192.168.1.36";
           user = "john";
         };
+        "z2m-nix" = {
+          hostname = "192.168.1.129";
+          user = "root";
+        };
       })
       (lib.mkIf (config.profile == "work") {
         "ubuntu-nvidia" = {