diff --git a/secrets/cloudflare-acme.age b/secrets/cloudflare-acme.age
index ac27d45..1f1d3a2 100644
Binary files a/secrets/cloudflare-acme.age and b/secrets/cloudflare-acme.age differ
diff --git a/secrets/dcbot.age b/secrets/dcbot.age
index 49d627c..823685d 100644
Binary files a/secrets/dcbot.age and b/secrets/dcbot.age differ
diff --git a/secrets/mail-admin.age b/secrets/mail-admin.age
index 2dc818d..97f636c 100644
Binary files a/secrets/mail-admin.age and b/secrets/mail-admin.age differ
diff --git a/secrets/matrix-registration.age b/secrets/matrix-registration.age
index 4366cca..9bdd251 100644
--- a/secrets/matrix-registration.age
+++ b/secrets/matrix-registration.age
@@ -1,13 +1,16 @@
 age-encryption.org/v1
--> ssh-ed25519 WCPLrA O62o78V2hZWQlryaHgFxmamXDNfmLYXTp3lrzt9U5DA
-rWBE1vK6jwwtyw3vdnsi0qyMrj+qrRrVj2kA78coCmE
--> ssh-ed25519 7/ziYw XoiKSbx6T6+TPyM+z7zbVNt+bhZStsgLNbpHJPLENTQ
-XBVt56fD+B2vy01YZ7kysnFUSJB+0wFt9Ck/homQumw
--> ssh-ed25519 VQy60Q q0plFjWYyrpNh0wsHBGBWUhFLnf1DseUuPaUHwqEsUk
-z8m4g7EyWbYX6hAW0+LwVPn9wxzszFLBwuj8AogT7jA
--> ssh-ed25519 GQzYWA wmuFU1lQPbTOWwMLj3OfzWqi5YCzvzWBXO8Fhg1HkD4
-2SY6zGXlELyahlthodTGgK8z5RT3K//QgwB8YdfqA8A
--> ssh-ed25519 MfR7VA Deo3Zbnl3iDlEb0RanvXbTK/nIRSD6G3mS14cAnp7jM
-6HVTjzeEBU3D4bvc7bQ/r8pMwYmOd2JKkG8JQEsNgLY
---- DIkiD0fi/qewJDmPYoa8r706ZaKiyPV1GNGN8MygDCw
-����GM]���*�HA�G2c�ف��?���'F��jZ�y�L��d�̸�#/{��^BI'
\ No newline at end of file
+-> ssh-ed25519 GQzYWA HUUPAVVdWQwDfVdnKf6lJWU/TFBOiNtRp+cq0/gKEyI
+HUb5jnhTO+AT/57FoMkumkGOXwNaPjmKLgsYvS2/Uxo
+-> ssh-ed25519 MfR7VA D5pc2zpXi1xjwFPpqXfFPtYJMqjP+9mCtJfL2XzFpg0
+gz+r15P1EcIFdRSMZGOdqKnPKaMawaJS9wtqsBRyxYk
+-> ssh-ed25519 +cvRTg H1Fub4Aw8LTBUmFnrIzw4mprWxyNbXOUqz9HGg3m2Cg
+jdn7fNtF6mS1M5EEDs91z6ZQ/nhSgVaGCOqvCTPFjBE
+-> ssh-ed25519 WCPLrA xuUK7++F3flzCiHPKu2TLShyKsw1huqynDFDlzQoMXY
+c1HmyuGrCxOIz6RomSF39kSkaOy3lQJp+xA3tICFofc
+-> ssh-ed25519 7/ziYw Rpjvgv1P2NpPvPcN3GPJO9MSnRFenj/NhWClVxjuln8
+bF/jUgSg/510vllJQcsrJIl18AwnYASr2Zo+LPQe2/c
+-> ssh-ed25519 VQy60Q Q8hgJUkurwUS17BuSNo58C2xMf+iJ53cBwn8//nTbiE
+PTLkj+unuzFV9+QWU5nLvXX8n+lYNsyS9raE47PWRAY
+--- TwNIzEZqCR803AawxtCO+qNRrZck5QKrzfvIO5ZcTuo
+�i��d���
g��X&��[��ω
+أF�=7=5[�⠯��T�v-�ڐ�/�V"?tvM|
\ No newline at end of file
diff --git a/secrets/password.age b/secrets/password.age
index 62948d0..c547b26 100644
Binary files a/secrets/password.age and b/secrets/password.age differ
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index bddada7..190ca21 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -1,17 +1,22 @@
 let
-  jswLaptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHB3qkRCskSMiAs2kLTsG+ruESK4h1pP1FHm+rVnKWx4";
-  jswLapserv = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOx/ic0gwhQGpUnlQbpnW5TisPXV9TQgNz6JrQ/vjhaL";
+  users = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHB3qkRCskSMiAs2kLTsG+ruESK4h1pP1FHm+rVnKWx4" # jsw@laptop
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOx/ic0gwhQGpUnlQbpnW5TisPXV9TQgNz6JrQ/vjhaL" # jsw@lapserv
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII/WnwVZAUEC/mi7OxhGRXIMASHVj9t8Jbo06xa+NsjG" # jsw@desktop
+  ];
 
-  laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKZebJtRg3+dZYDGOw7dyjHL69i4MTFdoQEeHlW/AsDu";
-  lapserv = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICyy+Tvkelrghc3Vftq8aTnUckec9BV8Ba8XAKCDc+Uw ";
-  desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBBwuisiDr/WiZ4Q/HUIiPORiC8Ik47+qRvB0SL3enf";
+  devices = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKZebJtRg3+dZYDGOw7dyjHL69i4MTFdoQEeHlW/AsDu" # laptop
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICyy+Tvkelrghc3Vftq8aTnUckec9BV8Ba8XAKCDc+Uw " # lapserv
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBBwuisiDr/WiZ4Q/HUIiPORiC8Ik47+qRvB0SL3enf" # desktop
+  ];
 
-  systems = [laptop lapserv desktop jswLaptop jswLapserv];
+  keys = users ++ devices;
 in {
-  "transfer-sh.age".publicKeys = systems;
-  "password.age".publicKeys = systems;
-  "dcbot.age".publicKeys = systems;
-  "matrix-registration.age".publicKeys = systems;
-  "cloudflare-acme.age".publicKeys = systems;
-  "mail-admin.age".publicKeys = systems;
+  "transfer-sh.age".publicKeys = keys;
+  "password.age".publicKeys = keys;
+  "dcbot.age".publicKeys = keys;
+  "matrix-registration.age".publicKeys = keys;
+  "cloudflare-acme.age".publicKeys = keys;
+  "mail-admin.age".publicKeys = keys;
 }
diff --git a/secrets/transfer-sh.age b/secrets/transfer-sh.age
index da1b850..b32d055 100644
--- a/secrets/transfer-sh.age
+++ b/secrets/transfer-sh.age
@@ -1,13 +1,15 @@
 age-encryption.org/v1
--> ssh-ed25519 WCPLrA 4gjoFXcJhpCAIiB3SxSP43ueHdMlVO7ZZeJRT2Ym91c
-BaHveMG23VmjJGjqFXlQIXPVnAowAttPTXgIaST/UoQ
--> ssh-ed25519 7/ziYw n/NfASqdDI2aBzJIiymoh6iP48Cs1B4FpgC0pCPnLQM
-UgT9BChcyuA40QuBtm8g21ExJ55ZJCqCahVGiZHjC38
--> ssh-ed25519 VQy60Q Y4oHOpGEb+vAdiaw8mS6OMSZaObJw44rogfTslM8OUs
-05tetaSTIzahR2khV0+7qvxUi/71ifrEYZGDXAJXsRc
--> ssh-ed25519 GQzYWA kAURcWDjATw6QphIw/CoRmmhrGmpBxRPPtJJjM2ScVM
-gawlegYwJEsn2qdDq6cB+Dj8C9GawdFBQPiaBUq0Mp0
--> ssh-ed25519 MfR7VA kCscBGcIXx4UVDyVjwm6103O6bbio/uAcCZaKwJIZ2c
-lbx657+/8S3p2GgQsM1rA5FTwJvF9G6loTBNVDLWfbc
---- cxFw+6cPs94pN9LBosJYXLZW7usNQIVMVpgAYhnGfX4
-��^�T�}�dʒ�%���{��-������'��y��(a��MN:��^}m�K������Ä����_}&y��
\ No newline at end of file
+-> ssh-ed25519 GQzYWA BhRFXgPCI6a+8M0cSSFik9oj5f6wjNnVRghpsM0EJD0
+c2Ue4dnBgpznZbl34tY5p9kCcL/K+8sjKxt29u1c9CI
+-> ssh-ed25519 MfR7VA ngYk7RHsgBf7Z3+EKzVLKFdaZWB1lJv9+7aXd7vuTmE
+5XzyFj/ysdE0L/pVXglrrRv0Ldlm5QUsfi1jrppq8cY
+-> ssh-ed25519 +cvRTg dSLqgHuleeYTSgRC5d0MjpyPd4kQkFgzvi3ExRNzYUY
+/ULGsvTrNkSrVQbR+mIVxE0tc/qG6zfoHUY4XzmUu60
+-> ssh-ed25519 WCPLrA mJ+hi6JL9yf76yxTa/HwpP1tcXwCKQI6VrbKKR5dUVM
+UxwFcbGWbQnxi6tfJkgATTdwbV5+P2DAYNse+cw3vRg
+-> ssh-ed25519 7/ziYw tB6POWjcAZBf1aogsEAW2B69o5X0HSQVB3cRHz1Z5mg
++FVYPKwp+OxQnHe/gc+7PYi43BqFEOzohSJklUeFUcE
+-> ssh-ed25519 VQy60Q PG2/pp9lG2Q4NUZidphRarjFPJKMb47rMoTJC4f4m18
+Br31hVsXEV74hT3zJJGKlgRMw+PdZAoyTWF/BTvcuYQ
+--- +EiMxabFl4UpiEzDrIsXZhvj4XyIYKn5l4BV7RLrVbQ
+y�U�Z�̥�]��Nn�A�x�
Jd>�d�*Gz����T�i���+�Ȏ0EsIl^vW7:ţ �_w�y��m��
\ No newline at end of file