diff --git a/hosts/global/core/user.nix b/hosts/global/core/user.nix
index 76e1a3a..6ca9f30 100644
--- a/hosts/global/core/user.nix
+++ b/hosts/global/core/user.nix
@@ -46,7 +46,7 @@ in
         "video"
       ])
     ];
-    openssh.authorizedKeys.keys = builtins.attrValues config.secretsSpec.ssh.publicKeys or [ ];
+    openssh.authorizedKeys.keys = user.ssh.publicKeys or [ ];
   };
 
   # Special sudo config for user
@@ -69,7 +69,7 @@ in
   users.users.root = {
     shell = pkgs.bash;
     hashedPassword = lib.mkForce hostSpec.hashedPassword;
-    openssh.authorizedKeys.keys = builtins.attrValues config.secretsSpec.ssh.publicKeys or [ ];
+    openssh.authorizedKeys.keys = user.ssh.publicKeys or [ ];
   };
 }
 // lib.optionalAttrs (inputs ? "home-manager") {
diff --git a/secrets.nix b/secrets.nix
index f1808e6..3c8d14d 100644
Binary files a/secrets.nix and b/secrets.nix differ