diff --git a/nixos/.sops.yaml b/nixos/.sops.yaml
index 0609d7f..7273289 100644
--- a/nixos/.sops.yaml
+++ b/nixos/.sops.yaml
@@ -1,7 +1,7 @@
 keys:
   hosts:
     - &laptop age1ldgnl53dmvl4fjz6hgdj0cvensagddn3ltpmxfm72m8q273w75fsk42p8v
-    - &nixos-homelab-00 age177wwag0rmyejqm37l748tuup5lvdslaza6kjkrjhdfce2drajscqn6cmru
+    - &nixos-homelab-00 age15w5qelqemnvytp38ywdwmflc6qmrqph3dwqmx3lrec5cm5d9nchq9pfe8s
 creation_rules:
   - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$
     key_groups:
@@ -34,3 +34,4 @@ creation_rules:
           - *nixos-homelab-00
           - *nixos-homelab-00
           - *nixos-homelab-00
+          - *nixos-homelab-00
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index e99d1cf..6ae8449 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -154,10 +154,16 @@
 
   # Symlink the user directories that need to be persisted (ssh key/repository folder)
   environment.persistence."/persist" = {
-    users.sysAdmin.directories = [
-      ".ssh"
-      "rp"
-    ];
+    users = {
+      sysAdmin.directories = [
+        ".ssh"
+        "rp"
+      ];
+
+      root.directories = [
+        ".ssh"
+      ];
+    };
   };
   
   users.users.root = {
diff --git a/nixos/secrets/build.json b/nixos/secrets/build.json
index 828600b..26f37cb 100644
--- a/nixos/secrets/build.json
+++ b/nixos/secrets/build.json
@@ -4,11 +4,11 @@
 		"age": [
 			{
 				"recipient": "age1ldgnl53dmvl4fjz6hgdj0cvensagddn3ltpmxfm72m8q273w75fsk42p8v",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVNkdjMER1TFB5MjRvWUxh\ncVRTRTNtV1ZuNUJjOFhGa2hYK0gwdTdVbEJjCjlDYkhDN1BEMHdjZStES2lyMUlF\nWTJZOTFFQUxYaDdSY0VUd2dFd3pBOHcKLS0tIFQzcm9aSzF6bklUWXJJTjcrRU1K\ndEpLY1RQNXN6YSszbUhzeGJPY3dXZW8KgOb1rFnqibwvtBdC55f2aVDIC3V33b6k\niIboCO/swiD7N3IF3imvaHdG9ILy5oIH9KJOCpl12RrLvhIlU/lp6Q==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMdHhLOVdFcEhLamc5RlZD\nb2lLUEtQMVJLMjljY2ViVnEwUDRCL2lmQWlNCkpvSmNHaG04Zm4rc1FjcGNLTU9P\nYUZWVEJpdk9iY3BqVWUxZUNVYlB1ZFEKLS0tIDlQTFN1QlBXQmZXSU0wMlVzSEJi\nWDdRNUV3ZHJzSStmdEhra0lPUW1OQzAKCOgP8Z0rCCcJtlKIVmrSR9h4Kwfb7Vpw\n9h4px8mJ16Y7/+K8edgCkex6JxN6aQaqPby+UV0U6YrPGyno4qgWDg==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
-				"recipient": "age177wwag0rmyejqm37l748tuup5lvdslaza6kjkrjhdfce2drajscqn6cmru",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2ekYzQWZtM25IUTl2OU5i\nS3lkdFpLNUluZGxZNlpja3FlYUpzTmlRUDE0CkVneURXcGE5Zm5pbHlHeXMzZGJD\nODdXU25XTk5oWW0zQnhhdlZqc2pKNE0KLS0tIFNmOWdza3FYWUl0VTZlemFHUTd2\nRXRtOEpIZGwzOTBUSURWQVEwcHZXd2sKhqH+YCXCH/mplhUYxGOWz6S3ha+AJWqR\nEtdnr2XK6V8a1OmdMBtoYdym72S7W30TksoW6I+bYNP9lW74GgbuFw==\n-----END AGE ENCRYPTED FILE-----\n"
+				"recipient": "age15w5qelqemnvytp38ywdwmflc6qmrqph3dwqmx3lrec5cm5d9nchq9pfe8s",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvNkprc0RlYVlkbUlqKzgr\nNEdNU01OWlFlNkVuekhJakZrMkdxSUhvcUZnCjlZVXBZS0lTVU52Y3ozSEhsRk9C\ndTZzeDkveFRyYUZNS1ZPbjJZZ01PZTgKLS0tICswNmlBQVJnejVub1NsMy95dnlN\neXQySDY1OVo0d01oMG9RYXBBMGlxZGMKwkVhiXzprx8l8EHbsCLsiPwahLmhdJSd\nVCCzuVE6zrm6MuKsUGo7+IkG/ESNiQ7X2ijO0ODEpfVNyvqMIRjvWw==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
 		"lastmodified": "2025-04-17T15:26:55Z",
diff --git a/nixos/secrets/cloudflare.json b/nixos/secrets/cloudflare.json
index 9481356..868d8c6 100644
--- a/nixos/secrets/cloudflare.json
+++ b/nixos/secrets/cloudflare.json
@@ -5,11 +5,11 @@
 		"age": [
 			{
 				"recipient": "age1ldgnl53dmvl4fjz6hgdj0cvensagddn3ltpmxfm72m8q273w75fsk42p8v",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqdk03R0xaZ090aER1Wldt\nRGVGMFFMZG90TVovVjJoWm9ONU1VaDdQS0ZnCitKcUhkV0VzODVKUkNxNU1rVXJk\nK1BwV1piVlo0Q0lTbUVTUlhDUGVZK28KLS0tIGRYeVUza2JRNE0vZzZsMTg4akJo\nMlBSNVNUZTBObDB3N0pTYXhtQWgydG8KTQs4V0VjUFWl6pUk4Po/03dxE+ANpXJb\nd8k1n39aqNa7WQdoEe6zUQlPhaGHUszj8bIbdv46GiVADCJGJXs+Wg==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxYWVLTVZOS0VESVRlQWVX\ncmpoNHVCV0RRa1FRb21KUmJ1ZHcvc2xmQ0FVCloya0N1UWpSdGdJdVN4a25zNG9K\nQWl2b2lzQWtOa3lqUDJHeWg0ekcxbjAKLS0tIGdBL1NiUGs1WGIrL2FLSCs2WWgv\ndkhqbGlMdzVFQi8vMTl3amorNFpGdjQKvroY87/GXspFnlJ8+GGb5OYJNdCfTvVd\nxO+biYofS2/GqV3VGyqKBBNNFzhoGdf/3Ax510dcDYh/zavt0PqV3Q==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
-				"recipient": "age177wwag0rmyejqm37l748tuup5lvdslaza6kjkrjhdfce2drajscqn6cmru",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxb1ova3FYUE1wVnU0anJN\nQ28rRzNpbFlJTW05c0xUeWMzZlFNUlRsblZvCktmMzRGU3dQSnhwbVY1NFBWVGpG\ndEJ0ODhFcXRzKzdSRGo4ZDRMeGtkQUUKLS0tIFNBSVJZbkR0ampWN3pDVERDanFD\nZndXUGYyM01UcHFzV0xzZm5rUnpHYU0Kfc7Fh6q7xV4OyjB3F+fjjt9XWizm/fnz\n4fCkO9t0ZUcb7YoBwpHdZ3Ex7Xkey8URF2Tcv0/gWF0XyaJ0rOQvxA==\n-----END AGE ENCRYPTED FILE-----\n"
+				"recipient": "age15w5qelqemnvytp38ywdwmflc6qmrqph3dwqmx3lrec5cm5d9nchq9pfe8s",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyKzN2UHhwV0RtZzBFc2J1\nV3FYVFNNQ0JwdFkxenZXSllaVXZLZHFDT2lNCnpRRGNwQTZGT1pBN1VRQ0NPYVJk\nMzdXSzJ3U3NtWlU5VTNkVm5wV3pLSnMKLS0tIC9tZ3Q2N3RPd2ovcEg1VFhENVNo\ndEZwSXhwRnFuYTFBbDJyMEx5Q0REU1kKRRREzYsOjysG4fiIdxBCo69iNujrUEpc\nxNnTj1dSlGvwQrVDEoeHm1WYH0Pi36G2L+qGCrQviOsPk/kUR8wJUw==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
 		"lastmodified": "2025-04-28T04:15:19Z",