diff --git a/modules/shared/nix/default.nix b/modules/shared/nix/default.nix
index 40e5d02fc..a611e2887 100644
--- a/modules/shared/nix/default.nix
+++ b/modules/shared/nix/default.nix
@@ -196,14 +196,5 @@ in
           use-xdg-base-directories = true;
         };
       };
-
-    programs.ssh.knownHosts = {
-      "darwin-build-box.nix-community.org".publicKey =
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKMHhlcn7fUpUuiOFeIhDqBzBNFsbNqq+NpzuGX3e6zv";
-      "khanelimac".publicKey =
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJAZIwy7nkz8CZYR/ZTSNr+7lRBW2AYy1jw06b44zaID";
-      "khanelinix".publicKey =
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFuMXeT21L3wnxnuzl0rKuE5+8inPSi8ca/Y3ll4s9pC";
-    };
   };
 }
diff --git a/modules/shared/programs/terminal/tools/ssh/default.nix b/modules/shared/programs/terminal/tools/ssh/default.nix
index 6cd0e6ca9..7fb01f190 100644
--- a/modules/shared/programs/terminal/tools/ssh/default.nix
+++ b/modules/shared/programs/terminal/tools/ssh/default.nix
@@ -95,6 +95,30 @@ in
           hostNames = [ "git.sr.ht" ];
           publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMZvRd4EtM7R+IHVMWmDkVU3VLQTSwQDSAvW0t2Tkj60";
         };
+
+        # Community builders
+        "darwin-build-box.nix-community.org" = {
+          hostnames = [ "darwin-build-box.nix-community.org" ];
+          publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKMHhlcn7fUpUuiOFeIhDqBzBNFsbNqq+NpzuGX3e6zv";
+        };
+
+        # Local Hosts
+        khanelimac = {
+          hostnames = [ "khanelimac.local" ];
+          publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJAZIwy7nkz8CZYR/ZTSNr+7lRBW2AYy1jw06b44zaID";
+        };
+        "khaneliman@khanelimac" = {
+          hostnames = [ "khanelimac.local" ];
+          publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINBG8l3jQ2EPLU+BlgtaQZpr4xr97n2buTLAZTxKHSsD";
+        };
+        "khaneliman@khanelinix" = {
+          hostnames = [ "khanelinix.local" ];
+          publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFuMXeT21L3wnxnuzl0rKuE5+8inPSi8ca/Y3ll4s9pC";
+        };
+        "khanelinix" = {
+          hostnames = [ "khanelinix.local" ];
+          publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKEilFPAgSUwW3N7PTvdTqjaV2MD3cY2oZGKdaS7ndKB";
+        };
       };
     };