diff --git a/home-modules/secretive.nix b/home-modules/secretive.nix
index b4d5b9c..d6a8291 100644
--- a/home-modules/secretive.nix
+++ b/home-modules/secretive.nix
@@ -1,9 +1,10 @@
 { user, ... } : {
   programs.ssh = {
     enable = true;
-    extraConfig = ''
-Host *
-  IdentityAgent ${user.homeDirectory}/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh
-    '';
+    matchBlocks = {
+      "*" = {
+        identityAgent = "${user.homeDirectory}/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
+      };
+    };
   };
 }
diff --git a/hosts/common/keys/id_secretive.pub b/hosts/common/keys/id_secretive.pub
index 175e670..faf0cc0 100644
--- a/hosts/common/keys/id_secretive.pub
+++ b/hosts/common/keys/id_secretive.pub
@@ -1 +1 @@
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCLJj/fefApUkXp79YPPk1O2L6CW6kqISXSWWmR8+MX0wk3lQv1NUp1p87sE57i6aUcYMuba0U9y+ppQq603uOc= code@secretive.Mariano’s-MacBook-Pro-(2).local
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBLNJvauvfuOq5DUO0pnObq/8De1dW1ZM757sMGVvwLUHm48si4coYozbDISIe58Puc9uMkihvHSjNlZh0vMHoo= git@secretive.Mariano’s-MacBook-Pro-(2).local
diff --git a/hosts/macbook/home.nix b/hosts/macbook/home.nix
index e0a3484..4f585c8 100644
--- a/hosts/macbook/home.nix
+++ b/hosts/macbook/home.nix
@@ -84,10 +84,28 @@ in {
   };
 
   programs.ssh = {
+    enableDefaultConfig = false;
     matchBlocks = {
-      media = {
+      "*" = {
+        forwardAgent = false;
+        addKeysToAgent = "no";
+        compression = false;
+        serverAliveInterval = 0;
+        serverAliveCountMax = 3;
+        hashKnownHosts = false;
+        userKnownHostsFile = "~/.ssh/known_hosts";
+        controlMaster = "no";
+        controlPath = "~/.ssh/master-%r@%n:%p";
+        controlPersist = "no";
+      };
+      homeserver = {
         user = "jmug";
-        hostname = "192.168.8.241";
+        hostname = "100.122.244.59";
+        forwardAgent = true;
+      };
+      devbox = {
+        user = "jmug";
+        hostname = "100.102.140.44";
         forwardAgent = true;
       };
       handmade = {
@@ -95,6 +113,11 @@ in {
         hostname = "82.180.160.149";
         forwardAgent = true;
       };
+      "racknerd" = {
+        user = "jmug";
+        hostname = "155.94.155.137";
+        addKeysToAgent = "yes";
+      };
     };
   };