diff --git a/features/flatpak.nix b/features/flatpak.nix
index feead46..805c1c4 100644
--- a/features/flatpak.nix
+++ b/features/flatpak.nix
@@ -9,14 +9,6 @@
     };
 
     remotes = lib.mkOptionDefault [
-      {
-        name = "flathub";
-        location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
-      }
-      {
-        name = "flathub-beta";
-        location = "https://dl.flathub.org/beta-repo/flathub-beta.flatpakrepo";
-      }
       {
         name = "flatpark";
         location = "https://dl.flatpark.org/flatpark.flatpakrepo";
diff --git a/features/users.nix b/features/users.nix
index 0c3cd19..d5df29a 100644
--- a/features/users.nix
+++ b/features/users.nix
@@ -8,6 +8,7 @@
       uid = 1000;
       description = "Frank LoTurco";
       hashedPasswordFile = config.sops.secrets.password_hash.path;
+      openssh.authorizedKeys.keyFiles = [ ../keys/personal_ssh_key_ed25519.pub ];
 
       extraGroups = [
         "wheel"
diff --git a/hosts/shared/nixos-pc.nix b/hosts/shared/nixos-pc.nix
index 83a823c..bf01b76 100644
--- a/hosts/shared/nixos-pc.nix
+++ b/hosts/shared/nixos-pc.nix
@@ -108,7 +108,13 @@
       alsa.support32Bit = lib.mkForce false;
     };
 
-    openssh.enable = true;
+    openssh = {
+      enable = true;
+      settings = {
+        PasswordAuthentication = false;
+        KbdInteractiveAuthentication = false;
+      };
+    };
     affinity-thumbnailer.enable = true;
   };
 
diff --git a/hosts/shared/nixos-server.nix b/hosts/shared/nixos-server.nix
index 4a6931d..4428dfb 100644
--- a/hosts/shared/nixos-server.nix
+++ b/hosts/shared/nixos-server.nix
@@ -19,7 +19,13 @@
   programs.bash.enable = true;
 
   services = {
-    openssh.enable = true;
+    openssh = {
+      enable = true;
+      settings = {
+        PasswordAuthentication = false;
+        KbdInteractiveAuthentication = false;
+      };
+    };
     resolved.enable = false;
   };
 
diff --git a/hosts/vergil/configuration.nix b/hosts/vergil/configuration.nix
index 46ad505..e84707d 100644
--- a/hosts/vergil/configuration.nix
+++ b/hosts/vergil/configuration.nix
@@ -37,7 +37,7 @@ in
       isSystemUser = true;
       group = "remotebuild";
       shell = pkgs.bashInteractive;
-      openssh.authorizedKeys.keyFiles = [ ./keys/personal_ssh_key_ed25519.pub ];
+      openssh.authorizedKeys.keyFiles = [ ../../keys/personal_ssh_key_ed25519.pub ];
     };
   };
 
diff --git a/hosts/vergil/keys/personal_ssh_key_ed25519.pub b/keys/personal_ssh_key_ed25519.pub
similarity index 100%
rename from hosts/vergil/keys/personal_ssh_key_ed25519.pub
rename to keys/personal_ssh_key_ed25519.pub