diff --git a/.sops.yaml b/.sops.yaml
index 67048410..1c8bdec5 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,6 +1,5 @@
 keys:
   - &user_albert           D98BBC6C9A27324654C2D8C464F6C4EB46C4543A
-  - &host_nixos-vm-01      e743e87411bc58cb492d92a5374315aea8a446f1
   - &host_nixos-framework  11727dab3f62daaf7f92fc1143e3f07ef88bd5a4
   - &host_framework-server dfd3a496aba156fa521e82ada77d68dc727cf52b
   - &host_osaka-linode-01  5f548d87ab2b8a4d48d80da3f2ff8352998da7fa
@@ -25,7 +24,6 @@ creation_rules:
     key_groups:
     - pgp:
       - *user_albert
-      - *host_nixos-vm-01
       - *host_osaka-linode-01
       - *host_nixos-framework
       - *host_framework-server
@@ -40,7 +38,31 @@ creation_rules:
       - *host_osaka-linode-01
       - *host_framework-server
 
-  - path_regex: secrets\/backups-rpi4\.yaml$
+  - path_regex: secrets\/hosts\/osaka-linode-01\.yaml$
+    key_groups:
+    - pgp:
+      - *user_albert
+      - *host_osaka-linode-01
+
+  - path_regex: secrets\/hosts\/nixos-framework\.yaml$
+    key_groups:
+    - pgp:
+      - *user_albert
+      - *host_nixos-framework
+
+  - path_regex: secrets\/hosts\/framework-server\.yaml$
+    key_groups:
+    - pgp:
+      - *user_albert
+      - *host_framework-server
+
+  - path_regex: secrets\/hosts\/piaware-rpi4\.yaml$
+    key_groups:
+    - pgp:
+      - *user_albert
+      - *host_piaware-rpi4
+
+  - path_regex: secrets\/hosts\/backups-rpi4\.yaml$
     key_groups:
     - pgp: 
       - *user_albert
diff --git a/secrets/backups-rpi4.yaml b/secrets/hosts/backups-rpi4.yaml
similarity index 100%
rename from secrets/backups-rpi4.yaml
rename to secrets/hosts/backups-rpi4.yaml