diff --git a/homes/nathan/home-manager/default.nix b/homes/nathan/home-manager/default.nix
index 83cd8e4..51882df 100644
--- a/homes/nathan/home-manager/default.nix
+++ b/homes/nathan/home-manager/default.nix
@@ -72,6 +72,8 @@
             age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
             defaultSopsFile = ./secrets.yaml;
             defaultSopsFormat = "yaml";
+
+            #secrets."remoteBuildKey" = {};
         };
 
         services.mpris-proxy.enable = true;
@@ -84,19 +86,14 @@
                     hostname = "esotericbytes.com";
                     user = "remote-builder";
                     identityFile = "${config.home.homeDirectory}/.ssh/id_ed25519";
-                    port = 2222;
+                    port = 22;
                 };
                 
                 "remote" = {
                     hostname = "esotericbytes.com";
                     user = "nathan";
                     identityFile = "${config.home.homeDirectory}/.ssh/id_ed25519";
-                    port = 2222;
-                };
-
-                "esotericbytes.com" = {
-                    hostname = "esotericbytes.com";
-                    port = 2222;
+                    port = 22;
                 };
             };
         };
diff --git a/system/default.nix b/system/default.nix
index 1bcd87d..bb0a6ce 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -88,12 +88,6 @@
             path = "/etc/ssh/authorized_keys.d/remote-builder";
             owner = "remote-builder";
         };
-
-        programs.ssh.extraConfig = ''
-            Host esotericbytes.com
-            HostName esotericbytes.com
-            Port 2222
-        '';
         
         sops = {
             age.keyFile = "/var/lib/sops/age/keys.txt";