diff --git a/.sops.yaml b/.sops.yaml
index b49af20..e5aa242 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,17 +1,19 @@
 keys:
   - &jalr 3044E71E3DEFF49B586CF5809BF4FCCB90854DA9
   - &simon 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
-  - &raven 10E468768E3BCD6459F9F11AC8F765CF8AD1F892
+  - &raven age1fleny85nvjh6g4arn2tkpju0smq2s4hawwpmnyvgcf0sy65wd3ks4lcvfa
 creation_rules:
   - path_regex: secrets\.yaml$
     key_groups:
     - pgp:
       - *jalr
       - *simon
+      age:
       - *raven
   - path_regex: machines/raven/secrets\.yaml$
     key_groups:
     - pgp:
       - *jalr
       - *simon
+      age:
       - *raven
diff --git a/machines/raven/secrets.yaml b/machines/raven/secrets.yaml
index 296e672..872e6ea 100644
--- a/machines/raven/secrets.yaml
+++ b/machines/raven/secrets.yaml
@@ -9,60 +9,49 @@ sops:
     gcp_kms: []
     azure_kv: []
     hc_vault: []
-    age: []
+    age:
+        - recipient: age1fleny85nvjh6g4arn2tkpju0smq2s4hawwpmnyvgcf0sy65wd3ks4lcvfa
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBML0wrQWtGbjhEY1BpT0lU
+            OXZZTlF5SzlWSGc4dzgvYnJ1QUtRUDM4a0QwCmU2bEVRUEZFTEw3QW9MUm16QVFk
+            bmlwMmN5eldzRis4czJNTkpGUUkyd3cKLS0tIFZ3TWswMnBXOW5xOW8zbTNiUGtS
+            T2VuTEpzYmhESnJZTW5IS3orRk44ODAK/KBOctiKRH5y/zuI4sIKNK9nze6aDOmc
+            Eg7zjCXX3hvmowFt45rMKODJ56Dy6uJEgu6OWMWV2M87CphyHKA5fg==
+            -----END AGE ENCRYPTED FILE-----
     lastmodified: "2023-08-04T10:58:16Z"
     mac: ENC[AES256_GCM,data:yRoKVClRcbqFYM06F+83kU9s0KcoiYEx0fpr4DL39YoDDx3ZdX2aYqOEtPCGHKEccFanDsZSI4Q9jG2NEa9IykI9DDjQtci1pcNkt9VaWgPTTo2KzP086ncQHaKHyy109CjugeC2oQYIOBfSiO5b+/SP5fml2N3rhIGzROz2NRA=,iv:JR2MVuIxVhCDsx8kelTu86x4Snf6yqJ7s9vb/3bj24o=,tag:V9BadPHshitupxnAzYF3Nw==,type:str]
     pgp:
-        - created_at: "2024-03-06T22:15:56Z"
-          enc: |
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DY/xpNY5WhB0SAQdAg3as/btOvNHhLPywUjqmly8Z/FYiIexBKnHU7z/t/1gw
-            Y5uB8Ykskx61s3VBS+oiFHt76Ndf40noVXlyArhYNkR1JKxJ4Ld32/0O2l3jSNMe
-            0l4BS5LCUBZnyxMz/yq7roK6TOplWMCn0UymtLLrSn7p5y04xmM4FmZQgvF9w6rY
-            PpyEdtt27Y+xHZDxesZMdkBT3vwxJRkyY6rscd9YKlEqAHhvslf7XO7iQTzHgFA4
-            =UmXy
-            -----END PGP MESSAGE-----
-          fp: 3044E71E3DEFF49B586CF5809BF4FCCB90854DA9
-        - created_at: "2024-03-06T22:15:56Z"
+        - created_at: "2024-09-24T19:30:34Z"
           enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            wcFMAwDgSONkM+d4ARAAtqjFvGr1EJguUHDCMBvDRzjshVYCW57sRvQrSnpGFbKr
-            TiFaBPFow6NJMN58Tt2NUp2+lt3XaGGwqwjbNStpSXYhyF2WChrJN9PMdjvRIYPY
-            kZvjwfGAHKKrAKFtHVfLVPRi2145oDXjoYgLWq9wtWVR/5Id9WVBIg63F8Kn8hwc
-            3G1XsM85/6ggiJjWxHPj7PO+VOwlEJ0Uxg3REDpy5Zo0+xOQ8ESHPFAr2qtRlJzl
-            plYv9wrLrBbJcQ11NYTuhg0zf5yWV8mrhzrYn/1gWuaHDozuwyH8Q6KDcSxfXPCs
-            4c22fcuuylV99Ig4+m2IUtw19sk9EeQtDh3MIv2c6HV4uuYQEPjVlU4pPGH6wSXy
-            SrtSgWgH3BGiJPL7rv3Axy3h22zwgiRosDGDh/Qy65aU8ivjWJwwF+c457ULDcA7
-            a8asRIIywwxHJOLEggV1b8Addnl9DAItwK5MYwU/UvO0qSRrStKcf6UDxF9ZQmLS
-            aeVXR8p6NGEZ/8dEFUS8QDVOnp+J6vJDUwHNZzo2VYLqp9B8Zg78rsMMIHzKEFkU
-            EgHrg5+ilSZrkTCC3ZPiddK6esCEZCgwDTWoTOlxeLtt85G8GS7GHvykoXFqzDkU
-            8V6jpXSuK5EMfexVRajspqTqFPSxwSDAZhDSKstThUwbMkLfFo0ESYXy8+GfAITS
-            UQGSmewokOgbxb3QY+afQ4t6PEe/qLgc4IIDn+kuZ9KmXbNVqUbqgM4AznkoMCkG
-            U7OqeXp36Lu40mCDqyOPabDA40rM9sSkVUmXpEW74GeayQ==
-            =ddqa
+            hF4DY/xpNY5WhB0SAQdAyqAyhamC5ViSdA1B1b8fI2iaSIAfyVJEe2ZaDyFI82Uw
+            NPvBXNKx4u0KTnMG6tl63Tb2/6sC4uhkp3n/pM+cxKIMfTXodIenddK5siPs8MQI
+            0l4BeIxec9DiNskvxTqnZ7jtVd7hWy494cDrr7Yb9J0GZWQ5mP2ZtqgcDkbzZnqb
+            E8glyIInDNAKedtpbE0waUWPwbA3XAgsQX6xijwe5q0j4Rqqc4rlvJuk9Xd7G+M9
+            =77Op
             -----END PGP MESSAGE-----
-          fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
-        - created_at: "2024-03-06T22:15:56Z"
-          enc: |
+          fp: 3044E71E3DEFF49B586CF5809BF4FCCB90854DA9
+        - created_at: "2024-09-24T19:30:34Z"
+          enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            hQIMA8j3Zc+K0fiSAQ//cajo/FPvA1PmKXph8Ov7SmKD9heVzcvdAlxJPLFq2y+S
-            c7nH1033oaH0CTIEWyDGqOee9nS0+0NtnhnsUa8QO0Z+BhKj/3/o3ERxRCzRzxdZ
-            3Qd60o+rbqSo7XrdYIy2rR6iAs6re0I4k3P33ge+z4U8u01iv/GCS6q6fvx8mAeW
-            8Fw7DJXKOmC4dTkvrAScIScxmljAoEOiw1bIPf2w8mypvNL7QFMK4ow+Yi+3uDC2
-            Zy6pwvN2NWROPAmQ+D2PmZM40xJoWFkur8rMYC5eMq66usGCftZqaVPZVPR0dS3c
-            bVtmLdds4QzA79oxBbnwayPdCrqYEEGGDpJffOg1hneSPIBvVQVcECSEA6v5bBfN
-            zKZKmBiLZh1On3O4TOB/vkPucm/xqWwthTkQWJFiImbp3a2EQIqJeYb4ywDh2gxo
-            gzEf8SUW4ZyvhNSiAI/SkExOxZsKEBzkvbnxpzRR0+wvoCptLaUGX8MTtxyX2qm6
-            JWppTYcbmoDBGsosyVpcKSn7DTA2D7PgStZruewkF9UiAZQF12U46AHGhkRXGjSu
-            BIUlt7MGMgH7qKmavw5EtwhGFQPdIJxDxOylHy3JB8BH7rhZkWtC3DqEdHs2UN8x
-            HEOcgBuNYacHmi8yHEEKBgAs4I295rHBZAYvUWEJoyykFpOjyVGoo82kJ3F0kIjS
-            WAG2Sm6+pgwdYAspBBOaheu12UO9UC0J7mNa2UrRtS1reMB31c6thNXto6zmjM6u
-            y4C10byfQizvMJDkflSWDB/fRK47fcnrMU6Ye6Pfq5PlDVTKW4dB7ZI=
-            =iQ8f
+            hQIMAwDgSONkM+d4AQ//VH43OoHprfVhgtPmGjP3dHvWxLkAtyEi2QOYWjGLGbuw
+            l5TAY8RAp3c34E0qp52a2a+GSJUwdxVusK4MSWGzzg0x1VKPFr5Dz11SRnjqyWuQ
+            sM7zo9AP1cIUoIaP4G/jnwYicEH+3ADjFEpNazfNw56cpjWL/1yQSKK4uk4x/m7e
+            AWWcRQHJa7j/sPuR2R24CQjZq6WfxoDDe2v1J+NTxBoZh16CJ8LDUWOCAgRDvEDn
+            d1WczY5cu0n/IAl8baKrvAtBoahEeF97lBmZ7BtXiFT2c6jvwjY0erj+BA0N4Jfc
+            WnJaU1y+a0RKxvH3AOo7R09NmvFtfWcUrFD6k5jLGhvbkuMd4+akEhDv98GeW77m
+            qjimf2gOLt0mR536JQP0pZ41O5hXLGVhPDESRWKMkeJcJ97+7wN9WkUnfW+AA0+y
+            TSqQ+KEsJMIYK1HCWJeW8oc+G+gEY7iutIxY+dL7NV8EzUWREhy0/1WzEIb3AfgH
+            XfzQufzXnKG844GUV0WKHiff7/Wmuhcz6+yFNLqdG2u7LM91eBB3B00ubFmfcz4U
+            OO4SopFeGHUo7xjQMDI3SzwPocRBsL3Fz+f2o5zsOGUPS/UebLwgN4UvaW0BKbZ5
+            zRiC0v5OKWRMxZVbhpmfvfYFEjkflVfYuiTul6ajnaXarO+S9Sp8r+RSkkJx7ZXS
+            XgHjN92PHYzz8O0ls8NxJiMFdG5ozfims6VN3sC98LjhRsaCb5oEwh8ZoB6WDb7y
+            0FeEsVM12vBGVF2oU8SVSJNnsgf4aMCTAPi+vdimq4UBKMEyxBwWkp62r2xXmoA=
+            =/jcl
             -----END PGP MESSAGE-----
-          fp: 10E468768E3BCD6459F9F11AC8F765CF8AD1F892
+          fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
     unencrypted_suffix: _unencrypted
     version: 3.7.3
diff --git a/modules/pubkeys.nix b/modules/pubkeys.nix
index 52dea77..c515fe1 100644
--- a/modules/pubkeys.nix
+++ b/modules/pubkeys.nix
@@ -16,8 +16,7 @@
     fablab.pubkeys = {
       users = {
         jalr = [
-          "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD0f7+Y4QSUsSvd360eq0Q/ESVfE/s0WxJIrzvW8cazTcmld8/rKxGQR2xrxApu7pzZlZC3LDbQrx3B6nNVEZi0dPUgkJz9oEKRY5vSJ6x0H9cZ0iFfTcCTz5znflqGaFI6E6W6Vtl+DzIrmkFgaR0wNmV9DCcYAJreW4E32t8dKsG1Pv347N0eAZs3shokPYr7dmGoNiKzTOn/ILQ1Hxppzqy1ch2h8k2KL0+FM6wO76ijivBzfMZRJW0DVYsmebO6Je5HglkzYXvrNUtcD2gIrNE0YKByjorTjjf3336S+0uBGxetzhnl+XA2PxHB/3n9AzYC4DI/Nb9wgLBo6Ql+EYaPLKnGl3JHvtcOyAfoNVPdNDfbZz+tfe8cBUt1IPTlm26RYKgwCnJvcBD6dk/5mxu1ogjSfgEIqihJaq3j3+NfIY1CUFx1U6ISG40SWEXF5xV1qW3NZg5FqqA8sOfWLlkON/yFkPJ2shXUXmiZtjXMWM6XLIO054EN7cpUxHGPspjgynU9XLc45c4k5lKF1xQv13B8n8dHNEL01MU21svfdGcpuOsRvzagLX51+rVRJObYP1bZudyYVDgsxB6B/TiBHw3Xl3mwEs4KVi/cqVsPpaG3hwqCreDlV+NeCVtb0qb1WJ2Sae83CA6NEcUvRbrwAnU/vEhJepfo6j7WSw== jalr@jalr-tp"
-          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM2x+uWFR4z9MzwZnlFMgJrFXxpruZ58WukKyWrCjURj cardno:000616522763"
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH3l+Yixrsjhze20CSjvUK4Qj/BNqbTNitgk20vuzPej cardno:25_750_479"
         ];
         simon = [
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAJ7qUGZUjiDhQ6Se+aXr9DbgRTG2tx69owqVMkd2bna simon@mayushii"