diff --git a/.sops.yaml b/.sops.yaml
index ab886b69..a6e7c7d8 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -3,12 +3,12 @@ keys:
   - &user_lappy_colin age1ml8kkppftygu2wag57yld98jlrkh4avp54eheq7q0fa2rup843csqjajs6
   - &user_uninsane_colin age1z8fauff34cdecr6sjkre260luzxcca05kpcwvhx988d306tpcejsp63znu
   - &user_moby_colin age1lt739n2tq7dmpglvntjr9j2r7426md7rat7x9w930gagtx4jyvnqwts2al
-  - &host_desko age1s0v4fm203ap6mckcz3djw8hx30uqu87xfhfdajpmyf8rfrf5xs5swpz6m6
+  - &host_desko age1vnw7lnfpdpjn62l3u5nyv5xt2c965k96p98kc43mcnyzpetrts9q54mc9v
   - &host_lappy age1w7mectcjku6x3sd8plm8wkn2qfrhv9n6zhzlf329e2r2uycgke8qkf9dyn
   - &host_uninsane age1tzlyex2z6t88tg9h82943e39shxhmqeyr7ywhlwpdjmyqsndv3qq27x0rf
   - &host_moby age1t957gf0z865gya0khgc9x59wy76hzps3sgejjqtwcngn2xl273msxsmpe6
 creation_rules:
-  - path_regex: secrets/[^/]+\.yaml$
+  - path_regex: secrets/universal.yaml$
     key_groups:
     - age:
       - *user_desko_colin
@@ -19,7 +19,7 @@ creation_rules:
       - *host_lappy
       - *host_uninsane
       - *host_moby
-  - path_regex: secrets/uninsane/[^/]+\.yaml$
+  - path_regex: secrets/uninsane.yaml$
     key_groups:
     - age:
       - *user_desko_colin
diff --git a/secrets/universal.yaml b/secrets/universal.yaml
index edd4508a..e424e66a 100644
--- a/secrets/universal.yaml
+++ b/secrets/universal.yaml
@@ -9,74 +9,74 @@ sops:
         - recipient: age1tnl4jfgacwkargzeqnhzernw29xx8mkv73xh6ufdyde6q7859slsnzf24x
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLdHljSks4SzdWa2pkRTU3
-            aGtJMmhUSHFWQXQ5MS9MUExZNFg3dklhZ0NZCkhrSE8rdEhTeVBMUmNxOVpnZXN2
-            clVzWTNlcExqQkpPNWVlNDBxdTBZZFUKLS0tIEdIdHpaV0ZPeDRwb1ZMWWhqd2po
-            VjJhOG9yVFAzTFFPZzZ1NGtXRm1SQzgK1iNvyOr2K7dZTNMFojyJtXRLybZRdFfB
-            5hGEfrgDB5p+jJgwuUvwjuuqeAx84CE0/tTBDV5gcgnVWLE543VIMg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByK1VnR05haFd3dVVzNlRL
+            UC9wK09GRkNpWjJQaUtNdGxPZU53WHU4MmdJCjZadlRwS0w2SVRMWVRzYy9HQnNN
+            N1gzL0plRDVuWEpUcVM1L1dGaXh0VHMKLS0tIG0rODVhWlhIN0E4bnczVmFrMWwv
+            Y2d6dFdDQjV4RDliV0EwbWdycVZLN2cKu5VYjLW+k6pUVzB8vUEmv9eArJw6VEd3
+            S5mrzkYWeaJmbzkIL2wFg3hvdb/VRGdjLH2ttoOgcDzodsoN8GtMUw==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1ml8kkppftygu2wag57yld98jlrkh4avp54eheq7q0fa2rup843csqjajs6
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaSE1sODJZRVdRajZSRGpI
-            NXRYeDl3ZkVUaGRhUVRKU3Ewc0VsOUNWRERjCldGaWhqUnlnM1lObGpQUmtVZzh1
-            eG9rNE8vZWI0c0w2Y2VhZitWdWsxSTAKLS0tIC9kSUo2UWFER09pU0JHai80MHQ3
-            Z05iRGpXRmxDcm81T0dacWpIZWpkMncKHWDJ8SxnGAfkG/b8WmLH79RAmmSjnz/A
-            EGhkBDMCqdG3UuURwxmFVI1ZKvDBiCdn2BEMpKaKcdYym/7iEv4kiQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0MDZkcnlnb3o1Y1NQQ1hM
+            WUhHZzliOWhFTFl1TUlURzFIbFY0UjhscDFnCklWMzNtSWU3RGdXSVFJbDFCdTlB
+            OERqekIzM0Y2aWl5K2tsYnZwTjZ0eTAKLS0tIHoyS29YL2dRNHJublorOUtVb0gw
+            aFJhdS9sQzVaMTBHcmtCaHNiZERKdkkKC7e6uy123ei3H7pEblvwfijyD2BziRhh
+            P2trcApd8G90tg8TMVoIjuaXO4YX3BZC82j6t3Z1OjnlC4wiaGM2TA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1z8fauff34cdecr6sjkre260luzxcca05kpcwvhx988d306tpcejsp63znu
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjclF3R2EwUEJvSkptV0ls
-            NEt2bkhqNVVoaElaeFB4SU5XQ25jdEtEZlV3CkZEWTNFM1RmWTFabGpTSk1FdUpE
-            cHAzSGRheEVOY0cybHFydXVKSmZCam8KLS0tIFcrRCtYWW1nam9UR0Y4NXIzc0h4
-            aFR4a1hDRk91bVhkMFhGNWZ4VUNrNUkKsjkLZ4zRudbK8r5u74bJKv5frX+4KFTX
-            q3n91UNcXqZgDKquwvGsq3P0cs+GXA8xVe4QVWlgtIilQ6hbDu6Sqg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGZkxjUnFaU3NkOGJpRHFa
+            cXNGTURuR3RxNkd3RDlPWlp0bFV4MnNPaHlFCnlycHJDVjFaN2JNZ1VJZU54dDQw
+            ZnZ5TDYzR054TjZnWG5yeVc3NEwzWGsKLS0tIHBxNFNxSHl1REdZWEtBdkg4SnIw
+            aVRLL3pKTXpGUTBLMW1QMEtEZGZUM28KKq8CMTJhncnCv4XDo6OJJ5WMwIPAeBRA
+            dcpJx96XX/hVQ0Xm/iJwwsjXyLUy22/lvezz0LfV/GxjHbhvlanDjg==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1lt739n2tq7dmpglvntjr9j2r7426md7rat7x9w930gagtx4jyvnqwts2al
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKQlNpMmh4aVFiTnpLQjZ4
-            VHNvdVAwZDFDYThHd3duaHFEVWRKWXFjWlc4CmNJRUxDQ0pDQ2NSdHJTSUhwcDdk
-            TFNGaSs5VU1Cbm5QMDRFQTFwL0ZVUmcKLS0tIGR5dUx1emt6dVRVWmh2dmtaNVNP
-            ZUxYMW40Z1NnM1lCY2ltazJiQmwrRXcKyOoJQVETOvAVA8OtXV0XTYMFC//XCVB3
-            SAne5IAWfP1VgoxhPJVz5guZZawOVhDkoDKo0EXJEXxNeKVtYtfrOw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1Z2hoQkxKdWw2MGxiaUtX
+            YnlKaGlGRnVKRXREV0EwYXZHREhSZEdlNnlnCk1QaTczRnN1OGNGRjA3UFVaTVk1
+            STRBdGMzQXZ6cEs0SXJwbmdDVmlzb3cKLS0tIDBlajVtdGZ4bnJjOUZLSk1EMnZ2
+            eGx5cU92Q3M0a0U3cXRrKzY4b1VxUmMKZFJOM9O4HWNkpAnkmiV5LGAlWcgoTsLo
+            Cr9oWuDLsu8Yj5GjbJr2znfSs2ms5HL8V9DB7FEec6qMLKabjc/QWQ==
             -----END AGE ENCRYPTED FILE-----
-        - recipient: age1s0v4fm203ap6mckcz3djw8hx30uqu87xfhfdajpmyf8rfrf5xs5swpz6m6
+        - recipient: age1vnw7lnfpdpjn62l3u5nyv5xt2c965k96p98kc43mcnyzpetrts9q54mc9v
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrdEd1VEFic3FVaDVzUnd0
-            VjBxYmZrOFhvMFNndGJ2cGVvSVFMZXN5bWdJCmNxRmtjSWFseXZaekFNV2kyTlJk
-            dk80RGQraU9seno1Nmd1clFsMGZNaEkKLS0tIElRSUdORDhaYTVQSHpnZzE3Mml5
-            SEdHVTRXUTl3alU0TC9yZTAwQTQ0ZHMKv9TSOJAYVgcb0bSVD4DDWZOdWJWIqIll
-            7hXWmjrlUsPMCyS0h9SyvRW32L4hU+lsmfA/mTexGApLuwPYbJ9H9Q==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFU1pKbFJPa2p0TzE1N2FQ
+            ZklRL1k1VEFvZlJWS0c2Q0UxeFhnMkVmUzA4CmM5TFhrUWsxWmltZjI1bkwySFJX
+            RnRoaVpDR1B2SG9YRkRlbXQvZ1I4TEEKLS0tIGhSUWlabmsxVnRJL0hYMGhzK0FN
+            cFI4dnluYi9mNSt6ZXNhQkkyZncyckkKrBXxSpVtZbvbqMoRiiZ0j0dor23q0LdO
+            V5IiVTsyuhbMFbFiHN4sshLahFiF/ZzHIOELwuG2DQ+4pXXj4yCwFw==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1w7mectcjku6x3sd8plm8wkn2qfrhv9n6zhzlf329e2r2uycgke8qkf9dyn
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBodDVkK3NnUTdBNDMyRjNJ
-            bExPTExzRTQzNFY0TG9rQkVCQjBjMi9UdUFNCjdFWkhxb0xnUWtNQUdpSHZORVZ5
-            NVNQalRXNGIxWWQ1RTI3UEZtY2JMQUEKLS0tIEo5NkVEVmRPRzVHbkZmVHNNdUt2
-            cDF0VnkrWjVkYnZrTWZiU1J6QXRGZkEKzB0ghzsGC4LKs46gL/fLgRP7tlfKWMdQ
-            qsfUQjfLRaQOyg3ItuGaVH46Wk57xhZZ+jQuaZz5Tka2YX/KluBY2A==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwWFoyYm1XZWUvZnQrZnBS
+            UTV2S3Q2a2FRN3BxTVRHQVI3bFJobGc4Y0dzCkFxQmhiRjhEb21XWFBuK1Y3MWZI
+            T1NRVVBaSjN6OUVYcUJhNjB5NDd5S2MKLS0tIDhNZ01uQmEvK0dSN3ZveUh3SmM3
+            NDlTNUQ4VTh2VFk4V1Y3SUFpNkovMG8KmgJpYjK/AGp8ZZjQZZCahWxpP4Ac8U93
+            8oslZiRbOQRZYhLu3rvW3GOycR2TEbFz8a+oiL5cVnSb2/vZWvHEJg==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1tzlyex2z6t88tg9h82943e39shxhmqeyr7ywhlwpdjmyqsndv3qq27x0rf
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGOGVJTHY0ZnA5RTNJRlZ0
-            S3J4eUNVUjlJck5KRGZTakQ4RFoyWDBEOUhFCndTeUwxeWMzZFFZMFRsQkJVemZL
-            Z1NpOXRUVmNOMU8ycXFsTnNWTmwrUmsKLS0tIGVReXRQejdlUlFWbXg1VmRYUlRI
-            WmRRVkhrTFI0bDMvcTdJQXVPdmJOWEEK/Lgy6iqMuZkeHyI+oUU9UzwGMIGX4yUy
-            WuDHa9I8futbVlrWhwfC/lU0zgb6tCl6RJfuEpjhYrzleuY4qpKFuA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0OGVESXM0NWZjT2IxdFM4
+            UkZLUEt4VDMydDRYcEJjRTdjSnYwMjJtZGljCmNkVzl6a0JySGR0Y2ZXNmhLZVBh
+            TUQrT0lyT3M0cG5ZaDhUamxVem9PVEUKLS0tIDV2a2NLRmgyZUh0bE9pdzNMRHRX
+            MUt2eWRTTElDM0pHS1hXZlY2T2VoV2sKrseuo03JDaGUyHHLZPc/h+2RkstEf+0a
+            nWgZtuLiSTQdzM80DGUKuciBvwM5XA/ws7pllNn7bpwnmDnfHqtEPQ==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1t957gf0z865gya0khgc9x59wy76hzps3sgejjqtwcngn2xl273msxsmpe6
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6b1Z2K3JnbENqcDNZSllT
-            WUR3SzFwaVNIa2RlR0I0ckFvVWVvNnpXR25NClNENHVwVEtZTFNzU2RIUmdqazda
-            bk1qYjZZSlA0KzFMVXlQcmJuMkxnWlUKLS0tIG94Zk0wYVFyeEg2eHh1aFdVbDJp
-            U2oyUUNiVm14bkJEcXlIUFpiaDFTRUEKTrtvjVgsUbRJDV640i84flkBD9RgtEZ2
-            mFPEMDOobtEvqEYlUTUsYeHjVQe0gEHXkLd3zFPErVx4FB0dLZpGrg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJVGIwYjJhNktWQlYrK1Fl
+            NXZNcDhKVlE2ZlJNbVllM0FDa2FHYk1XY2o0CnZycVoyNVRzMFJyZ2JIZVVvOE9H
+            K2FZRFlRbjNUcElDckt6cm1rSXZQc28KLS0tIC91NVJSNWgwSFpQQ2hIMUNYeGlJ
+            Z01DZUlZMnlPNnlnVUs4bzBRODF3K0kKjNXNvDKL4Sto8CJsFxGJXq4uPrKgGKWn
+            JWb8kBfCuEk8rESoOw7vzrIthVD2GL0b+/YxRX/87pWC9eEglMI6XQ==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2022-06-10T01:15:42Z"
     mac: ENC[AES256_GCM,data:nYzWojVAZWgChRpoYq6LOnSYUN3Ja5kW7km//sSrzEhDKQWW8oYV40QNuIDYHhRrEpyieucoxJvjpDLsGg2wqVemYxN+9aPuyO92033wweT/gyZXI4Eq0d5qyXT3Fxcfgo83P0KdNI31rjOUegTW1WGccHOz8LupnmRUpLYeono=,iv:Ri4+GZPREA17URjK8D9abAmD+GqRk7GQcPNyBNyooWg=,tag:l7eYp7Q7EJ8TFvjSxuHFrw==,type:str]