diff --git a/users/adisbladis.nix b/users/adisbladis.nix
index 58a235b..18be455 100644
--- a/users/adisbladis.nix
+++ b/users/adisbladis.nix
@@ -1,14 +1,10 @@
 { lib, ... }:
 let
   userLib = import ./lib.nix { inherit lib; };
-  keys = [
-    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtr+rcxCZBAAqt8ocvhEEdBWfnRBCljjQPtC6Np24Y3H/HMe3rugsu3OhPscRV1k5hT+UlA2bpN8clMFAfK085orYY7DMUrgKQzFB7GDnOvuS1CqE1PRw7/OHLcWxDwf3YLpa8+ZIwMHFxR2gxsldCLGZV/VukNwhEvWs50SbXwVrjNkwA9LHy3Or0i6sAzU711V3B2heB83BnbT8lr3CKytF3uyoTEJvDE7XMmRdbvZK+c48bj6wDaqSmBEDrdNncsqnReDjScdNzXgP1849kMfIUwzXdhEF8QRVfU8n2A2kB0WRXiGgiL4ba5M+N9v1zLdzSHcmB0veWGgRyX8tN cardno:000607203159"
-  ];
-
 in
 {
   users.users.adisbladis = {
-    openssh.authorizedKeys.keys = keys;
+    openssh.authorizedKeys.keyFiles = [ ./keys/adisbladis ];
     useDefaultShell = true;
     isNormalUser = true;
     extraGroups = [
diff --git a/users/keys/adisbladis b/users/keys/adisbladis
new file mode 100644
index 0000000..2c1962e
--- /dev/null
+++ b/users/keys/adisbladis
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtr+rcxCZBAAqt8ocvhEEdBWfnRBCljjQPtC6Np24Y3H/HMe3rugsu3OhPscRV1k5hT+UlA2bpN8clMFAfK085orYY7DMUrgKQzFB7GDnOvuS1CqE1PRw7/OHLcWxDwf3YLpa8+ZIwMHFxR2gxsldCLGZV/VukNwhEvWs50SbXwVrjNkwA9LHy3Or0i6sAzU711V3B2heB83BnbT8lr3CKytF3uyoTEJvDE7XMmRdbvZK+c48bj6wDaqSmBEDrdNncsqnReDjScdNzXgP1849kMfIUwzXdhEF8QRVfU8n2A2kB0WRXiGgiL4ba5M+N9v1zLdzSHcmB0veWGgRyX8tN cardno:000607203159
diff --git a/users/keys/mic92 b/users/keys/mic92
new file mode 100644
index 0000000..1c31e99
--- /dev/null
+++ b/users/keys/mic92
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbBp2dH2X3dcU1zh+xW3ZsdYROKpJd3n13ssOP092qE joerg@turingmachine
diff --git a/users/keys/ryantm b/users/keys/ryantm
new file mode 100644
index 0000000..42ee923
--- /dev/null
+++ b/users/keys/ryantm
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO37rmfhCI8e1aflMe1AlfK3zf9tXPHjV9dCb1FBupWt
diff --git a/users/keys/zimbatm b/users/keys/zimbatm
new file mode 100644
index 0000000..5968fa4
--- /dev/null
+++ b/users/keys/zimbatm
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuiDoBOxgyer8vGcfAIbE6TC4n4jo8lhG9l01iJ0bZz
diff --git a/users/keys/zowoq b/users/keys/zowoq
new file mode 100644
index 0000000..eb2b2cb
--- /dev/null
+++ b/users/keys/zowoq
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFbCYwWByGE46XHH4Q0vZgQ5sOUgbH50M8KO2xhBC4m/
diff --git a/users/mic92.nix b/users/mic92.nix
index 2f68f55..94f1925 100644
--- a/users/mic92.nix
+++ b/users/mic92.nix
@@ -1,13 +1,10 @@
 { lib, ... }:
 let
   userLib = import ./lib.nix { inherit lib; };
-  keys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbBp2dH2X3dcU1zh+xW3ZsdYROKpJd3n13ssOP092qE joerg@turingmachine"
-  ];
 in
 {
   users.users.mic92 = {
-    openssh.authorizedKeys.keys = keys;
+    openssh.authorizedKeys.keyFiles = [ ./keys/mic92 ];
     useDefaultShell = true;
     isNormalUser = true;
     extraGroups = [
diff --git a/users/ryantm.nix b/users/ryantm.nix
index 6bf21cf..4f64ad1 100644
--- a/users/ryantm.nix
+++ b/users/ryantm.nix
@@ -1,14 +1,10 @@
 { lib, ... }:
 let
   userLib = import ./lib.nix { inherit lib; };
-  keys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO37rmfhCI8e1aflMe1AlfK3zf9tXPHjV9dCb1FBupWt"
-  ];
-
 in
 {
   users.users.ryantm = {
-    openssh.authorizedKeys.keys = keys;
+    openssh.authorizedKeys.keyFiles = [ ./keys/ryantm ];
     useDefaultShell = true;
     isNormalUser = true;
     extraGroups = [
diff --git a/users/zimbatm.nix b/users/zimbatm.nix
index 47b6265..6329ae5 100644
--- a/users/zimbatm.nix
+++ b/users/zimbatm.nix
@@ -1,13 +1,10 @@
 { lib, ... }:
 let
   userLib = import ./lib.nix { inherit lib; };
-  keys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuiDoBOxgyer8vGcfAIbE6TC4n4jo8lhG9l01iJ0bZz"
-  ];
 in
 {
   users.users.zimbatm = {
-    openssh.authorizedKeys.keys = keys;
+    openssh.authorizedKeys.keyFiles = [ ./keys/zimbatm ];
     useDefaultShell = true;
     isNormalUser = true;
     extraGroups = [
diff --git a/users/zowoq.nix b/users/zowoq.nix
index 2d5fc86..9dc6130 100644
--- a/users/zowoq.nix
+++ b/users/zowoq.nix
@@ -1,14 +1,10 @@
 { lib, ... }:
 let
   userLib = import ./lib.nix { inherit lib; };
-  keys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFbCYwWByGE46XHH4Q0vZgQ5sOUgbH50M8KO2xhBC4m/"
-  ];
-
 in
 {
   users.users.zowoq = {
-    openssh.authorizedKeys.keys = keys;
+    openssh.authorizedKeys.keyFiles = [ ./keys/zowoq ];
     useDefaultShell = true;
     isNormalUser = true;
     extraGroups = [