diff --git a/nix/etcnixos/secrets/secrets.nix b/nix/etcnixos/secrets/secrets.nix
index 4ae7da2..25a2b64 100644
--- a/nix/etcnixos/secrets/secrets.nix
+++ b/nix/etcnixos/secrets/secrets.nix
@@ -2,13 +2,16 @@ let
   laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4jL6gYOunUlUtPvGdML0cpbKSsPNqQ1jit4E7U1RyH";
   desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBJjT5QZ3zRDb+V6Em20EYpSEgPW5e/U+06uQGJdraxi";
 in
-{
-  "wifi-passwords.age".publicKeys = [
-    laptop
-    desktop
-  ];
-  "primary-password.age".publicKeys = [
-    laptop
-    desktop
-  ];
-}
+(builtins.listToAttrs (
+  map
+    (f: {
+      f.publicKeys = [
+        laptop
+        desktop
+      ];
+    })
+    [
+      "wifi-passwords.age"
+      "primary-password.age"
+    ]
+))
diff --git a/nix/home-manager/secrets/secrets.nix b/nix/home-manager/secrets/secrets.nix
index b3bf8f1..99d72cc 100644
--- a/nix/home-manager/secrets/secrets.nix
+++ b/nix/home-manager/secrets/secrets.nix
@@ -2,17 +2,17 @@ let
   laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4jL6gYOunUlUtPvGdML0cpbKSsPNqQ1jit4E7U1RyH";
   desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBJjT5QZ3zRDb+V6Em20EYpSEgPW5e/U+06uQGJdraxi";
 in
-{
-  "factorio.age".publicKeys = [
-    laptop
-    desktop
-  ];
-  "server-password.age".publicKeys = [
-    laptop
-    desktop
-  ];
-  "borg-laptop-password.age".publicKeys = [
-    laptop
-    desktop
-  ];
-}
+(builtins.listToAttrs (
+  map
+    (f: {
+      f.publicKeys = [
+        laptop
+        desktop
+      ];
+    })
+    [
+      "factorio.age"
+      "server-password.age"
+      "borg-laptop-password.age"
+    ]
+))