diff --git a/common/secrets/secrets/github_read_token.age b/common/secrets/secrets/github_read_token.age
index 5f10553..3ddcbd6 100644
--- a/common/secrets/secrets/github_read_token.age
+++ b/common/secrets/secrets/github_read_token.age
@@ -1,38 +1,42 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBwN0dn
-RTlTdDd1ODZlcm5VUzdlTXRSdmZRdUdYM1B1b0hsUTJDUHUwZ0RFCkI3dnhINEZs
-Uko5bTB3K0h1R0FILzZWNjltbUpBL09EdFZUYXdlalB2dFkKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIFNGaWlyaCtLTzNTd1VnS2tjbGhiRVhDTkVaZ0dUdzBia2krbzBQ
-bjkxZ0EKbjdBY2VoY3R1dFpuU2NFVnJrNktpMUJlalZuQVRLSWE4UjVwYUhqZHB1
-UQotPiBzc2gtZWQyNTUxOSBTcENqQlEgZ1B3TWpaYnJkOWUvYS9wTTA4L2M1V0hF
-SFJDNzJqeEY3bnlTRStsWm5RMAo0bkZKVjB4QXVMTmVSZHduWHNISEVyTnVDb3BZ
-KzB4bFFxZnMxYlJhdjZrCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBueFhqOExVTTlQ
-NytTWHNrSXdyMHBHSUhTejZyQi9VRkh5ZWhJcDE2S2l3CmtHeWx4NEhCdWdRUDFQ
-Z3gydUdSTzJUVDJHUnQ0Tk8xYi9tR1p2dUhub28KLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIGN6Qm1QWTlXOVJ4MThhR2MwUStmM1FRRmw1M0hUN2RBcXMxSXRHSlVieFkK
-ejgzRFZtSm5ZaEZTdXhhUVN2S29Ca0pkNmMrL2RaY0R6T2kzQUFwbXlFOAotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgVURubGlzcndMNU55Y2lwbWYvTXpCTVVjdk9ZeE1Y
-YWt1MHlXQmtnakduUQp6NVE5UmtmcytPUzZZeUN3bnJlRjZKYVY1VWtDazRNMHVH
-WFhFK0x6T3JVCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSB6aHhHbGJUcmlEV2lPd2hn
-QmtIYVpScW1yWmVmb05CbzNXclludCt3c2pjCkxZRnlkdmQ4NldsclJUZWk4RGM3
-QVRQTGZ2RDlJNE9Qd3gvL2tOc3hqbkUKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIEEx
-R0UzdEFoYkh1aEFQUGZ3djI1WDFrRzFXRHpPcG1qeXQ5cWQxdDJ5SGMKZlVXREda
-V1EyT3VLaHFxN0hYbEZkaEgrTXVvejNZY3JpOTBkZ0tsMERqYwotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgT05LSVBaOCt5SVVXa1NMTTU0NWRhVjdkcWNlVXhOTEtWYkx2
-WUUzNCtWcwpWbUlpK0Z5OUQ5Sks5NUl3L2Nwd2Z3a0pYM3BpV3FYR05yTmFjckRh
-Rm9RCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyA0V1Z4enc3azZ3S1Rlb01zMGJkQ3FC
-cGRPWmRocmxOUkNzZTR2WTFnb2tzCk12WHI2SXN4T1MrRDNXQmtJeW9yT0o3elJ6
-U0tNSEt0VjVPNmdrVVNhREkKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIE9VVXVqMkFp
-QnprZ0NWNHF2QTMzK1BKVzZGQVN5MXEyTDNWVWM1ZXJjVXMKUzdZT3NTWjNudzRI
-SWRXRW5PL2plL1N3bllnUmdicXFPTVdFaGRwQVpZTQotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgdy9uMzlGMk10ZHZDYXo2ZkFqaDZYVTlNSHp4b0pweHlmUWJwamJDSU9o
-VQpsTy9GK2VJSzdMalhESVJ5YWtrV21yYWxBOTloZC9SMWpqSUNRZ28zWDNJCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBPZEJDSzJpSTd5V2JHK1VKVVFrKzZEQ0tVLzA4
-K0RlbzJXNEZvU3NxMXlnCk01VEw5c3lmUThkOVZETFRNRzFCSGlkMjBjWXR1ZUJL
-MnFjMXBNOXRNekEKLT4gVGEtZ3JlYXNlIG9XNyV2CkhvTWo1VUUxQW1rN284ZUxy
-bG9ocjNtdDkvY0JPOFhpaXZwd3Zic3Z1REg1ZmNTb2V1cUcKLS0tIHBwVDJLcGJK
-NHRFN203V0dPY09CL0MwOC9yOWN0OFB5OElVSjRyUHNlbUUK3vYYYjsO1gaI+Tjw
-2zKdP2JcYpk3YDKF1JBDhMtvPNU3Rc8vETNMmD+TkGE0hqorZGue9ah7ZK1Y5xYT
-/PF+rpKXxvYt77UG9B2F4+iQkuMkUrnbxFuY+cByfB5Qz71ixKmUt3DLLpqWA8xH
-4P5eTWGspaPb09g8+DeNAviH774GSs8EuN/nioDY7u9dp74rBIqi3k+jrJMC
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBJRmpU
+K2tCT1RTNzBhQlNzSHlIZDB4UFNCRDhiY1puVHQxN0QzSDNIbWhFCkdPVTFLYUcv
+MW1FMnUyVG9xVE5KaVJQWlhFYmtaeGl2RGYyWWhtbEtTTFEKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIDBNalFocUZXRkZxMU10L1pWN1I5eUlGWXlrMVNLazR5RExycnZJ
+K3BsaDQKVlZCUjRNL1hvMXFjRkd1VGVZNUp3ZnZBdW1qMEFpY3ZhYWFacmlZZEFa
+SQotPiBzc2gtZWQyNTUxOSBTcENqQlEgSWRpT3BZZ0pHOWZjWkszZVg3OEZaZld5
+d2hOdXpYZ2tXVThMb0FTK2ZEQQpKY2xXT1dDeEp1LzlDcnoreVNvSHdCL2dDVFVs
+bUUwQlU4Y3pXV0F1S3RNCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBrMFJOd0xrcGp4
+TkpxTW1DZWUxc1BQVTc3S05scHEzQ2hVT1I3bWhQVnlZCkVZQ0dZMm82VG81Yzda
+MUpmWjZRUUx3NVBwVTlUZmtaS2JJem5ETkR6eVUKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIGhoSVhmVVNlc0toR1pBemk5WGp4R0NYdFF0dWFjVlpVcWRQT0hIUlNhazAK
+czdFNlIydWFYSnBuTXNBQXE3eTZtUTBpUUJrdFFZMUZldFh4TXpVWEswSQotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgYXp5MElHS04vVlV2b1RoU3RRUTRCeFlHWjRLajFt
+L01Pdi83YnRjNndWTQpFVDk2djEyVFVaUHQyTGliZDRFM0Y0Vi96STFJR0Nqa1hn
+a2VYVFhzelNnCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBET2dPUk5rYm9wVHczaE0w
+L2hpa0F3emZqNDBxR2c1OUVVNnBNeVc1SzBRCmhIWmFKTnl2TFFBRUpyejhEMFBj
+cVR6RkZHS3lpZzd6MzgrQml5QXpWdjAKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFVk
+cE1YSS9rdzBsTk0xNGtlRjJSV2llNVhYOUsvdVVFam1wUU82czNTUlkKQTdLcFdk
+akErdWRrUXZET1hjL2J4UFJzdkNFVTlEUWJFWTFaczQ1VmxDNAotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgQVNMandOOVFiN2xuQTd2MC9UUmt2MVg2YUlzcHBHaEJBWG1E
+Y0srMU9UYwpGQnh6L09qY2JvL0tqcGNnWldkWUVzRHk1QVJvN1N0YlRVNCtlMlV6
+MUNVCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBJR0RzZWpCNHNHcXBhQVErVUwxcG9t
+K0M5RSt0M2R6SFpwYzB5MXZFQVM4Cll2NmJrQkMwNkFGbWM2bHJ2THhNbG9XS0dk
+cmEzWUFCdXBLS1dyNWh0aU0KLT4gc3NoLWVkMjU1MTkgWmUxTXdRIElaN2h2aHRO
+bDRtNUlrMlNmOWVSYlpvR2VVeWRxL25vMnFjVUVmc215ejAKVlBmcTFtN3BUZXJx
+eUg0eXY2S3V0ZklGNzFnK09yRUJacnZYUllkUzF0bwotPiBzc2gtZWQyNTUxOSBw
+ZUZCUWcgU1J3VG1lVDlCNmNVZ2hZbXI4ZDhZdE9jYnNkNHpQclpqQmdGcFhuYTBI
+RQpkMnhjZlYrWjBPZVk0UGt5UEZmQzZoOUxSVG8zMVl6MlZCT1JneWJuWVdnCi0+
+IHNzaC1lZDI1NTE5IDl2LzJIQSA5RldGVWx4aU9ZVUNQdlJTRUVqbS9CajlnTEdR
+NFlCZnEwSy9rRGNIM1RRCkxKN2FUQTBVbVA5SnVZSDlGcXFKL0M1NGhONFhLamF3
+Z0VNZ1VSSEFKSlkKLT4gc3NoLWVkMjU1MTkga0hrMmdBIElkSFNJWnZ3WFA3V1J0
+aFNqN0RTQUEvNkRkeHI5QkR3K0RuQ2NnZTFQU1UKb0dKd3gyYWdPd0NyUEZDWUhB
+eUdaZzIzWEtkNGdUZzZScWpOUzN6K2dCTQotPiBzc2gtZWQyNTUxOSBJb3NBQlEg
+eGNINUY0UElXbUQvUklPY2c1S1A4OXh0UWRsTjFGUTg3dW9BM0dyTVgwNApyN3pV
+eHhUSnAxZ1ZpdmUva0lScWJxNGFWZDRMdm8zd09kay9ORXdOVkljCi0+IDMtZ3Jl
+YXNlCldFN1JnNGM4Vmh1dE5wZUNGOC9NdktlSEFnCi0tLSByVzE2ZHZSdXRxQTZN
+SjRTNlRtUHlRL2JPS1Yxd1lnalFFUGlWR1lKTjZvCgfzY9S+Cm6zaEAcrAr3fsev
+9enyx9OmVTIIZltr52uqCYbWcsuCkDjHtwR3NXiSQB2HWhNe38l4l2K1+HGcoS7i
+2TMD7o9Jx6QoWLHgmrn/zXL/VKyOj5a7P530AMzdqcgJ4U8641VN0W7L9u1Cw5EB
+Ujzb1rKthf+txuP04aWYit69ZBdH7r+VkOGghXngwvBapwFF8AGUug==
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/headscale_auth.age b/common/secrets/secrets/headscale_auth.age
index 1021d13..867be94 100644
--- a/common/secrets/secrets/headscale_auth.age
+++ b/common/secrets/secrets/headscale_auth.age
@@ -1,36 +1,40 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBCdmRB
-eUI5NzI3cjJBYUVhNURQWU9Od1RYQktjYjlYMXk5WmdNM21FcVZjCmcyU2Uwemdx
-VUZXU3JBdUlTRDhRZXRJS2pDZ0dGekwxK2hQUVIrbE9ObzAKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIGVMT21sWkl6S0xRQkhHcVR1M0pHRHFMTC9pb09DdytJKzBtaDQ4
-MUtMVW8KSW1lQW9oM1ZVR0tjWUdKajlib05WemtvakdwWmRzbHNlcVFNZHgydVE3
-WQotPiBzc2gtZWQyNTUxOSBTcENqQlEgMXFLUFBIcndyZVpwcng1TlZFcDNaNEFR
-ZkNhWGYyTTdOYlBEak05aW53awpnblZOMlplaXVCdnl4Vy8vd1R3b1Nlak5CaXVU
-VllkUGdoSDR5UmNad09VCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBNVXMxWFpFaExU
-MnMwYjNTdVJ6L3N1L3VZamJ0THpXb0w5eTBsc28wdVJNCk5wY2QwN1FydGF5dktP
-WEcyWEhiN3Z2NWEwek13bEZOTEhHMGlRajYzQ3MKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIFlMbExLMU9YdGZsdnBxZG51cjlZcnZwcW9nb3hodXhPbEpSQTZDZVhzR3cK
-MUdjdWxVQVRwREtlbXlTL1hob0N3QTF5N04rNWNIWEtnKzQ3MnpScDRPcwotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgR0gwM1lEQTFUZ3JJZWErbWh0TjRHdmpUVkoyTUU5
-S05zK1Y5SXpuV29nUQpWMnI2Q2t6OGdJSHIrdStMNzkyS2lpbXNDWkc3aXNYNFZ4
-QkhSQjdTR1pRCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBXUVNoSVd0a0o3dDBsYjhR
-Nkg4M01xenpJZGtrMGc2NEx5cVlpVlEwdGowClZNL21XSks2RVdNODkzeS9KZXp6
-UUVxbkViYktMZVZlanJFR1htZEhzblUKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIE5R
-TVJYS2hXd0ZhVFY2MUpwU2loeWRyallDdEJkZVVwaTBpTVl5clFBd0EKSnhXQThN
-REN4NG9HSmVzOWhwWHdic3M4MUQzWWRORUdMWFI1OTl0ZkVoSQotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgVkIyZDdpREtQeE5jclU3SmJiRkpOcmVWbGZzU1VuMWRzVzhy
-WC9EU0d5QQovckk2ZUY5MEhjSjZEUWRMamo3K1J0Q0FSaDZIU3UrY1VzbWFMYjBD
-WHdVCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBLVmpza2ZNMEI2dFRaWXQxNTl1YXlp
-WkdrMnplZ3VybXp3eHExQkpJdkMwCmI1TmpraGlJSW1WdmZab3pPNGg2c3YzUW54
-NXVLYktpYkE0NlNERDBjMGsKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIGhyK3BzQU9p
-aThpK3dvSVZlZnVLaG5OdmgyRy8yOC9wMm1qRy8rb3p4QTQKV1RBTHVDL2pVYVpX
-RS9NNlFKbU5KS2J6aTU4c1FlN2hockhIenVvMFhjZwotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgcnV3NDZaUnlvT3ZKeVM4TUNTRFFZbDZFYnpKeFVzSkxrc05kYmpNd3JR
-QQo0SmtuMmFpbnhXV3c5d1pRa3FjZ2VvbW1IT3c4MitXam5xSWhnRmFmWExrCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBweXdxV0x2RDh5Q3ZHcXpSU2twYlMvdHgveWh1
-SHBNRHgxNklXOFpoekRnCmFSYStqT3JWb3M1Vm1ESEJ6cVBhaUFEd01ubWlTT0xp
-ZjR2THhCUWFvTkkKLT4gMENoPHJKLWdyZWFzZSBiCkR4YUYKLS0tIElUbWhKK1Z5
-ejJJNm9oVlBlY2ZYOWh6cTJXZjZhdjAzdEVGS3IzMFFTYVUKyW+D/FlWHdQ13wuk
-NUa8EzfdEWzxEkztB07kCp4/LCNSkqAzQpxuPKVdXnFjJPR0uQE6S6PARqHUNAub
-6hH45by9nWB//kGOCJMj7lg+tFHo
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBvbGZC
+ZFZWZ2ZPWUlNdEZCSXBuYThubHpiNkFzb3Jldlh1QlF0UTZ0NHlZCjlHSTVrekQw
+MDBsaU56Yk9IQVZaQWJDMVNoUWFlQmpJV2gyTXBXNEhNdDQKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIDU0eDdqTStiUUlCUUcrYWhDWVRSQmxPNEIySk9NallHaVdNVFg5
+YXNPa1kKQ25PNGxjc1hid25Nd2R5RCttbHN1ci84T1pmQ0ZkNDM0R3FLbGdHRnRm
+OAotPiBzc2gtZWQyNTUxOSBTcENqQlEgNjR5WkE4eUQrUGk1NHFMY3BjclZKWkd2
+TVd1QVNoVm96QkcwcHZmdG16dwpRQjY2V3dOOGo3VlJ5aTNLS0NqUVJ3VHNTWC8x
+V05kbm5yQ3F0MWNFM2ZJCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBFeDIrUWEyYjVw
+QUdjSlBWQ0Y2N01uL3hxTWJiNkdCVkM3UTBZbDhBZWhNCnRraHhUb2NEMzJWbWl5
+SjJEenN0VjJCWlM3TXEyREN0ZysxSG9Rak9hMVUKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIGxYRDJta0x6QnNkTXJnQmZwWFlRL0wrNS9EUS9TVDJMRFhZWDBUKzRWaWcK
+VXlwL01IYTdTTTY4Zk1FOHBMc3E4ck1DZHp6aHhEaXFBWFN3SGErcjhmUQotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgVUozU1kvVVJsZ0F2Nnk4bmZnUUNyTU8rM1FCRjFY
+bWVBZWNNUFZIcFQyTQpzK0Z1SXVFQWhFSnp0UGs0RHJIQlZrUUtlY0ZFTjdwSTZS
+MXhjSTNpOHNnCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBvQkd5UlNUakhGY0dkRFly
+SU4vM3A1Sm5xNnhIZm5PUjR5WFNLZ1ZmL21NCk00M3k0RnNjL2dkRVd6MmdGSW1G
+aGt1dmwxN0VTQm1zeklDN2MzRmFqSUUKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFBQ
+TGdvVjdEaEJDQ1FxbjhTOVdZTVdjLzJhc3lwdy83UHNyOWJPNk5ZRjQKMTdNemRQ
+L1h6Tk1EVTdZcnFPRVdEZjhnU21hLzcrWk0zS05YSTV3ZGJQNAotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgTFcyc05mMnNVdWFDQWZUMGN6OWNZeGkrWlMyakV5RVhHaFJw
+bmxiZ0lrYwozcit3dU84L0lVU0JXbVN3YnJoK0NPOUZKS3EvSkNPQ3FCWWhYZnhx
+azhFCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBNWWJtTlVQTUo1SFh4b1Q4Vk8vUHdG
+V0xLWjRXdVZxVVl0L2JMeTBrdWxJCmJvNGJ5Q0JUR0g4Q0pISmxTVll0OHl2dTFJ
+dlNtR1A2aGVTUEZRMU5Hc1kKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIFkxendRYm0y
+aEc5dTAwQy9pLzBrbUpVVlpFbnlDdlI4bGh0Zy9oMmtVWHcKNDZuaTBDV1o5MXFV
+NlBLVzlqc0ZzOUdMT3c2SmRYV3hVd044bzZoenFqVQotPiBzc2gtZWQyNTUxOSBw
+ZUZCUWcgQ3VDSnNLMHc4N0dCQ0NOY0lscStpeHlKdXA2UGpqRVhjNDVzV0NCQUx3
+VQpkeU9FOE13bFlaQ0ErWlBFZ0VWWTVZZElQdEg5UFo1SVRSeEhqRnk2NEtFCi0+
+IHNzaC1lZDI1NTE5IDl2LzJIQSBaREtQS2ZsSmxSQml0bkZzd0prUXdvdkhBZzhY
+VkNRZWZqdVNvODIxMDNNCkJVMWZUc0o5Q0g0Yi95czFaVkhwejh0QW5HcXZ1Tmdl
+bWFKSUhITkxFYlUKLT4gc3NoLWVkMjU1MTkga0hrMmdBIGlNcjZMWEdjdHNpNWNl
+ZzlrNklvVklXM0tDMGVnRWhuL3BYV3dMa1U2ajQKd2owZXUxSGlIVUI3cFRxbjA3
+eWFhZXVudlBpQnRMTEVwZXhSSFgyOEsvSQotPiBzc2gtZWQyNTUxOSBJb3NBQlEg
+OXR4MFc0eDZQQ1IwclIxYm9kYk1DSkZBZ1RDMm4wYlEyb1VrRTBaNmpWNApwY1pu
+RE9VTU9Mbm9Ea0twcnBNRUc5ZjdzYXRyRmw0MlVHZDZmTVVLZFBrCi0+IHwqflMt
+Z3JlYXNlCgotLS0gNWpFR3lvdmVsN1V2WG01aHN2VjVUeDZORzRpRDZGK0RWTFRM
+SytLcVZYZwrYTHZo/oozQZasJAFNVb3ZrSAjREvZzRRyz6Mj71Pj2H+dbFz9sZ+c
++B4DEN/4xfhm5FUsU2w8VCQ/E+186igURD2AyhUZxNFFVPUPJKUM9rY=
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2bitbucket.age b/common/secrets/secrets/nix2bitbucket.age
index 0162f78..0dd3a93 100644
--- a/common/secrets/secrets/nix2bitbucket.age
+++ b/common/secrets/secrets/nix2bitbucket.age
@@ -1,44 +1,50 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USAvaDU5
-QlpRVTNqVW5oa0hrdlhSdElES0VoeXduT1NNYUU2TTJEcERYYUFRCnBRVkFWbGZE
-UDVXWmJPQ3RNRHBLY2lMbWdxYzl2bVlHSUlKd3FpUzdhTlEKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIEV4MlYxa2Q0RW1oMThZMG5aN0RSY2htcWhxWllpWXA0eDBIL2hl
-VnZhQk0KbVZoTERCc1hDb0ZpUERjZzJOdmlsOG5SR0pub2JzZGFHeDVHa0xnR25L
-RQotPiBzc2gtZWQyNTUxOSBTcENqQlEgNXY5dTZqdUZyejZVUFlLVnFMV05aekY1
-Sy9WRkcyOTYzbGVjM1NtbTd4cwpGVzdlQldYeGxvd0dnMTNTMHBzRzNqU2padDJ6
-RE0wcFdaVENrMlNjRDN3Ci0+IHNzaC1lZDI1NTE5IEJZS0crdyAxWlo0U051ZkZv
-a2V1R1d5Rm9EcW9lMFN1MldrWkxKMjFNZlc0UXNRQ3dvCks3ckdkdFl3K3ZhS1k1
-UVg2UWlrYUNqWVZza3hQZ2x5L21UTDR5bjd5OU0KLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIGpyaU9vV1JKVUY1OG9CK2hvNmZZUFZTNWlCR09EZHgrSWVtaGx0dnN5VE0K
-U3ZCSUJ4bm1yMklZNGxOZ0lFQVovemlJZlZHMTdzVzZjdHQ3Y3NVRXNtQQotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgSEYzSFRYNjhkc0ovaCtTdThjWmk1TUI5WDJTNVlz
-RFM4Q1dlUnY2dUVWawpwMnhYS2R2UzNsc0ZWendMV1dNMTVYbXNGRzJXb1ZTVzI0
-dFQzRDJ2YzVnCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBmSGpHVUhnMU9Ub3JrWjV5
-THI4TXNvTGJvbks4ZUJxWlJFME02elNHLzBBCnBaTFh5b0g2ODdEYlFnaHNXbzUx
-QXNwUzcyc01qWm1VYW9MYTk4UUpqM3cKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIHpV
-ZWUwMExOVTc3ZW12NmRPZitWNW1JZnY0MTVFWTJwNlhaT2FkdVJnQjgKK1Vsc1Y3
-WTNvQWgydFEvKzNNdEUrdTU1N0N2aHVpalpJZy9LOGo0NzhNWQotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgS0VOQkF0YzZlemZFMWxoallwL2VhZXRWMnJ0TnBnS0dSZVBN
-SkNLbjF4OApwRlFYanlDeHk3RnlXYlljK1h4UitKT2VwNDkyUm1xYXhpZ0hCRkZ3
-QXU4Ci0+IHNzaC1lZDI1NTE5IDVhZHFNZyBMa0FJNFVTK2NmaXlZQlpQbGMrRkNE
-bDRwaWliOEs2M0dTWmN5dWwraHlFCjNXK0Y0RjRiQldMaDNTNVRveVltQ2w4dklW
-MU5LUU1ZbjZld3g2eUtkTXcKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIDZyaEVVSFFW
-d1ZQTllsM1l3dVBuR3d1bGZ2Smk2SytLR2lJREFxaFFTSEEKYmo1ZnNjaXdVZWEz
-em5mRmFuN1VzaXl6VU9tNGp3VXJoRlQwQnBybEVvMAotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgdDliNHk1cHJQRXVuRmxobWRMbDVZTnYyL29DNUJTT1R0UUpZNFEzdWRp
-ZwpYM0l1SnY1K2c0RklIVHF3cXgvSitZUEVZODYwRVhqeTZVUW82N2NNcTI0Ci0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBzczRTcG5rUGdaL25YWTJqaE4xL3RKWHNtblQ1
-NGk2dFBndHRPWkVqV2dnCjl6c3VXTG9XL2VqVlNwazM2cFVtYnRYU2J4UTNDOUo5
-MFJHMWs4NDBQM0EKLT4gcThWTn5kLWdyZWFzZSBCcD5tdDVUCmxta1NuYWU3d2Fr
-TXZ3STJxVjVZenNrSms5OTY0UVIzWTN3Ci0tLSBUeUJzb1NOaUtjOWJmakRVWVJT
-N2tMbnJQdWlmTWN2UUY0Ni9TSzBWVndnCvz3vV6dSNSOT+ys33Mda63+AZi4CnTk
-CxDT2hImfzAyzI8EW7ls7ov5yzb0r+p2MLp45JfTE5LJq9kTSpeD/pNOmRgb/7Uk
-493VGddxuG1Ebh0pS5ZnERSTPivQHOwMrCKvjaCcO+KpF+6QkghM7JKx8gVkx14K
-7aizD5kg20iWFG5Ir0ydYuiJ0PofjKj7779aCSuzVbwBjuwwIpXxHbE/lVPJ/hCB
-8HpRUYexMMHbm0qEbrHLhbmE4NeI6NcfDFj90OhW4ODePL+RUg3rEzG377xCoGD2
-6fRdKlZTZXMcuZOtc/F2cE2ruGwkxvDFLccrbntxAEkNIQjYniZhGOLdSVXWO4bh
-nf1pT14bYG9W01E6BCdbcpvS1W8GE2tJSRDSh/utv/zmYOMLZvIZFAcnfX9IQZ61
-/IXvRaPT66ZamlZO3eNc/KA32qP1v7euX+0akVLjntqObv2faiAMLzpY6m/F0L6D
-PAJQUyetGLY4WRiCmsj1Ede2Z6HJxf1B0V7SkxJP9T080LoD9DP9zx7zPvq05m/a
-HBcCW+ZWoTI4lOaM6cEC1xA9jP/EhOiO
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USAxNHJi
+QjBYYnZsZTl1OXRwUDRXSGx4MmJOdzhHZXY2NUlaQ0hocFdlV240Ckw4U0FNSGFt
+SmF1aW5mM0lseFZDUDR1ZkgyRFdkbHYrUHdITWUxanBrWHcKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIC9vS1U5ajZ1MS9sdFZZbWs0cmlvc1VQRVNLZUxiQkRrS0xtWWx3
+LzMxQm8KdmU2V0pqZnNMajc4SVk5Skhnd0VQTmViMERIMWtqMEcrUGpHTXkzMGk0
+QQotPiBzc2gtZWQyNTUxOSBTcENqQlEgS0FzbGFCY2xtQjdlQ3p4UjJjUVdNRGsv
+ekwvcWhEK2o1OFkzYW1zMy94ZwpSQTlwRVlKb2x3SlR2QkEwSFlhRi81bGRObWhw
+OU9pdVBJcWRyZm8xQWpnCi0+IHNzaC1lZDI1NTE5IEJZS0crdyA5ZGMrR0xRcXJz
+STlKbGhEYkdOYlYzZHBmZkJHUTVYSndEZk1ab09Pb25vCmJWVDZCYmVTSW5nRTVX
+YzFHTnRMeGt5WE1Ydk0vZ3l3K0NhckwzbU5kN2MKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIHlJZG02U1JaZkVxVnhSc2VVZ21sdmJlMUh6eWhhK05lSkhES2J0L3JEUUUK
+K3FacHVNbEIvWk5QQTV5RHpOU0tpYitJek96YjF1a2o3dTJmTnZya3lpSQotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgUmcyWU94VEI0Vm1vUnpBWW9ieTYvQjFBM0hyY0ZU
+QWZoaUFmSTRlTEFIZwpINEFkeFJnVVNINWlBaS9UK0V5aExoMnY0TDVjSFdITEJi
+dzFpdm9wRGJBCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSB0MVR0bE9tMEw2bzc0SHpY
+N0JFWXFDbFJ3M3Rab2VtQUlLeUNUU2l1aTBNClNPTGpSTnFGeXpBcStjdnlmWllx
+K20wdUVVVlZnb1FJbEdlQXVTWWpudDgKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIDF0
+ZFlkaTNOMVNsV29rREJpaUdXSnFuQTlyd3pyM2I2bUtPL0ErUm9wR3MKenNsdEhl
+TDVjSmdQSXR4S1ZWR285RTF1T0hhNEg2TFZCUXAraFkzdXo3awotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgVVNrblluWm1Dck1yelpURWZoeVFjaUJFaXdkZldOcCtFVzJQ
+ajZUTmVsUQoyUmI4Tmttc21HemZDTmdERFhxZXlpdG1RVStiems5cVNaQWNIM3dv
+RlI0Ci0+IHNzaC1lZDI1NTE5IDVhZHFNZyAvS3AwTW1kaUtlQnpjaXByQU1uRVM5
+RDgzMVhBSFRWSVdwczhxVXdUWDBFCnBDNjEzU3BUcCtRM2tDUVRBb0Jqd1pkK0Zo
+WWJEb2gzaUlPTGRsZVlzZ0EKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIHRnQndCVU9J
+ZlQrdi81b2J2cmNzdXR6NHI0bW9LaHJqRlprTWZJM1RiRm8KSmpVQjF2U3BuVWVz
+Y2orSlc2dUYrQWRYSHFPb0JRZloxZHo1KzduQkJycwotPiBzc2gtZWQyNTUxOSBw
+ZUZCUWcgVG9LQnRwemt5T2VSVFBVK21acngxMHRDNDNxQlFxZU92NzRuK2U2aUwy
+OApXamtRUENLSVBBM2ZmSVNtWkh1TW41dEQrRkNYQndBcUlOQnU2Ky9BMzA4Ci0+
+IHNzaC1lZDI1NTE5IDl2LzJIQSBveE5LTWhRZEhzeHBQVmo4amNBTzlHWlFVYURx
+T3plT0lPaEpsb2F0RWhVCmh3aCtsU21zV0pYQzNmU3VqUXhhOHlYVEhsWDN1eHpD
+UjRjVkEyTVhrVjAKLT4gc3NoLWVkMjU1MTkga0hrMmdBIDNMWEtrbWh1SWRwVUc0
+Vm9uYlcvK01xcEdSWkZuZzl4eng3NjlwRXNPamcKYlArYXkxYlMybTE0UnhvempS
+bmlncUJtWjVZMWdHY3VvTHNvdExib2lzYwotPiBzc2gtZWQyNTUxOSBJb3NBQlEg
+ZnJtVEdzL1RFK3M3TGFpVGo1Mi9aN1pLRS9TajQ1MlNqODVad1M4ZDh3cwpVSWpy
+elZlT2dWTmhFaWJFUVFXWU5pT0dlam1jU0R2di9TUzVjUlY5b0RnCi0+IEJ6cnpI
+NVktZ3JlYXNlID1YU3I8WkNjClRpZ2dHWkJIaVZVVkNwY1JwOFg2bTdzTnJBRjRs
+SytLdFUyRldoTlpHSkRPY1ZQODRYY3RiVS9VNWtPeXBIc0MKeEdJY3UvTWdEZTVa
+RXNvCi0tLSBLcUNEU1JhQnRCK0RMS1F3VEt1Ykl2MkhROG02NmY5bjVIem1JeWdQ
+TXZnChn2UP3yo7fmH9JimBCsA8X6WLurks8pKMf5lb/yh92Uj+mbIz5R07Fpq0aC
+nLa9VhNeQU4nYkotJUVPRGhBlh7xaVRoeaRfRy8n34TKNU+PQUFz6gv0OHkMDOKh
+B3Z73OAJGaFAX1Q1SlM96ejHVMRdr8SNQao9QJvZq9EXyrejV1L8oS7cKHObfkEi
+ylUPlNsH375zQ+rizYqO3jLBGNXpK3RTOX/3xadbAeccyBLrSaoE+eQi2nba2fSb
+iLd6xNtltmDy4AzRwpmMPpD2EUlTV7iBCBlstK6v7k+VOAyH0PGIXTVUlHs8VORI
+PHx8boVaGNn1b3XSD3CTflCRHxo7gSfXzcDEnfIbPsz97Z8GdQmV6fqIoWyWS3ZM
+DFYdS7VBuKA7lUy9fu+UbP6OFjTu05rg35OcM6uzF6U4TVbKrGzaeyZzrokcXCbo
+LNYJaI0FY+/bznL8/YqU/EJsAzgSZLApIzo3wLJhd6YK9Si17Lgf5N8sfUvHN8ax
+naRZp7SlPmmzyhO82KwI8FXM7E+0mZ3CjfiEUmq9dz2plRGJaWCdMJ/SUv9EcTvG
+Z/Uo
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2gitforgejo.age b/common/secrets/secrets/nix2gitforgejo.age
index b3e413b..9e9ac24 100644
--- a/common/secrets/secrets/nix2gitforgejo.age
+++ b/common/secrets/secrets/nix2gitforgejo.age
@@ -1,45 +1,49 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBJYnVW
-Ry82ckpjY0VkNmJ4OWdMeDFzdzBZYm00bzRZZGRTTytVOE5TVWlrCkxCcnpPcWN2
-N242THRWUFE5ajdWaXRET3BkRWtYQ0dXZitSTldyL2ZKYTAKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIGpWTU5UTllxdTZmS1ZEV3lIcm1WaFMxdGxQSDBFWWpYVW44L0Zx
-anJEVE0KdElzcCtUeFhBbFhndjVwellJUkphdmZzMFRMK2p6VERxZXBJcnBlRm5K
-ZwotPiBzc2gtZWQyNTUxOSBTcENqQlEgWGw5OEJUektzNHptTnkrb1FzWUJVd3kr
-ZmIxcXdha3kzTERQc0tYcUczMApjYTZOYXRaSzd0Sm5oK0orNm1LZTNWMS9DSk9L
-UXRJS1daTU9XdnJ1T2o0Ci0+IHNzaC1lZDI1NTE5IEJZS0crdyBUZUpNMXdzb1FP
-SElEMHhacXlVemlPMytTMkllN1BSZE1NUUxsVnE2bFFZClhkWEF6ZHZZVlJtRGVi
-a0Q4cng0em80dmF6QnVKemZtbUpMc0VIbEd2cDAKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIGVZdk50MVRkaU5LK0RON1BEOWRFbVV2c3VrWG4rcVFtblp0aWdMZ2NEaHMK
-MTMraE9BVTBnaTkyL3BQd2k5WGZnc1BVU2RMZ0s4Y1hHOGZKTncvL01PdwotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgK1VQZXhTNHBDcjZPc1c2OWovU2FqdDZXaG81UUd0
-c041R1dBUndxYVVCWQozdjJmWVhIN3VVaW9DZ2xhT2FKaTZqMldQdU9KZUExa0d6
-cVBFWG5Nai9RCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSA0MjZxb1U2SW9CWmVpU01S
-WWc3NkZBeDFEWGh3SnZFMERUS3R1NXpVb1drCmNuY0xIejFUazhOVDNLRFJlRWFz
-SXJaRFBrMWpGKzZyRzJRc3MwdGVYbk0KLT4gc3NoLWVkMjU1MTkgRjRiYjhnIGU4
-cjlxMExHeGxOTXBLNTRSUld2R3h3eDkxSGlxUGNzdE8vYnpRSHoyZ0EKNWhVUXpJ
-VGFzM2dpRGdibGs3Yk5CVUR3R3hYVUExWFlkWUdJS0RBbnNFbwotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgL1VFeWVkaHE4Yi85RnhiN1k2SWNZQTdOVTFUV1F4VXFCcDFD
-K3JxaHUxNApPdWFJT3NXaXRPbGE0V0RWK0R5dElJNlhJak53Z240NjRWRFZrSzJI
-Y2NBCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyB1M01qb0MxUGVaSFBwTDhCckF0UDE3
-elE1b1VucW5FQnJ4ZXRQSjU1MlM4ClpGWU4xelVGQVhWLytzRVpkelNudVhUZitJ
-SUVEOFphdzBzSnliK2NhM3cKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIDViNEVKVFQ4
-cnNhNlJFTmVMZUlvUUd5Y3RoRmVDdzdSRUt2YjVuUkRCUWsKVkpYc3hXQWNubXBo
-dEErZmdsU1hkdzNyenlPLzlmTGkydlRqUExaK2N4VQotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgUFhrTG9jcnFvVkxzbkw0YzFydEFYcW41czI0UE5DR2d1aGk3Z3lVYWp3
-SQpsUFUyVktMbWF5M25JVGxNU2VrUFUyLzIzNUJEUVFSbEx1R1Y0K0crREJRCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBtS29UR251enk2eExUdHIwZExCTjRVL050b1c3
-L2xzWUlJY2VFYzVreDNvCk94d01tbGRIM0xzdnRPM2JMbWRUc2Y2bi9QbHVLaEFw
-dkN5YlRiL3ZvUWMKLT4gVy1ncmVhc2UgVEZARClWCk5DZEcvd0VuSmVJYlNZRGgw
-cnJLUVFHVkEzcnFFN2g1QkRXQW00SEcxdEsvei8rY1BmV2tublhIQUJoUE44ei8K
-NnIwZURtQmoKLS0tIHZZd2pzaE1CMStTVytKUFBZbWdlOTFzeWtZVHRROVJ4ZkZl
-NHUrU2RMd0UKEIGfXRqr8prV877eJ+hFlZ0xfin1Py4KW6aojONCjQDZonuwN/qv
-KJPsITztoUw1F1dAknTFUZCQ5TqNw0u7rWUnSwhDTcCxrzKbsKjRaYZ8Y0S7Ow1o
-VzBmihb9Dx/S4a99vjrBb0KGBQV5CTTqrG6Cd1920l3HOemt8R8Cjncn8jP5FPGk
-yfr/2Kiw0Dym2V+grAmUQnAi6OzaMum/ONXix+4dRRXbsVvQ2gWrMSbbis5YnZdR
-XcuUHpCihAFTau+bXg28YHbY2MK5lvNuqTTXX9K/9gEF3mybYKX3PETFSilCUhBN
-pEUZSUAYurhGGxbMDiIPuY3H56DbuESNWYCdaGbcNyLXiM47GHLq0CffnSAUXXYs
-5gLf3js4y0HYMsu4GCtcmGEJGFuc+JX5v21NWcECficpjn2QBCzPj01CQ7v/MFgK
-rxXcyZb8kAaUNuO2IgclTXRcP/r496V83JsdZD6rrwoyc2J+HxpOKPXsg383iYGa
-rr806lmxePIgf+KHyYI+YuHAAjR8g/s9Lz7fHb16GTWUaZ8D62hCcwhaZDiDEBew
-JVUC4A0yB4PS/aXQifRKyrYXAyQ=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBtRTlJ
+RHRaRVFZZ2Y2Uzl5dEZXSnplMlpYdy9UVVdvb0dSVFNGd25rcHhNCmp3ZHFneUJU
+eW1PaGlncUdmVHNWblQvbkVxUDJpQ2p2OFJFVGtNb0pZcXMKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIGdJOTRGVktSY21ob0JKam8zaDN0bkhIQjNieTVEcFl3aVBpSjhw
+Nk9OSGsKVENrTkd4cmdaUnE2VWR4SU1ySWdvZGo3VnMxTFo2dklwSTFieUwycTdr
+RQotPiBzc2gtZWQyNTUxOSBTcENqQlEgU0plOWVNNTNNTkxhSVN6ai92aTd6RFJ2
+WjFRMzdJUjAvbDN6MHVOMTNncwp3bVREblZMUE12WEVaOGpLVDBYZHdILzQ2UVBI
+V3MwTTFwb2dwcDMxSFBnCi0+IHNzaC1lZDI1NTE5IEJZS0crdyA2L0NONmxjcGFr
+T0xaRnhHQ0FFVVlseUtKcWJZbi9ISlZIclVOdTRNRDJBCitWRDBvQXdackV6QTRu
+S1FPeXdLZGpvbjhBYllVY0UvZ3JEWWQvMHNOS0UKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIG9XOEhybjJFclFKWEhQeDlrY0xVRHZOcHQrK2RWa0hsZTc0eU1qRWlNMTAK
+cnpLdGRDejAraERuNnVlZDBVV202TmdlSVREMVlPWFhpckdPY3Q4OTY0UQotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgQWk4Q25xSFZSbHo1NDJ5VnJWcVN5L2NIQi9SQVJ2
+aWtWSHR6azk3QmhEYwpXQUtjb1JZSHNuOFZHWFZYcy9HdktJVGpvQ2xuQXU1Sndi
+YlRWYWhiVmd3Ci0+IHNzaC1lZDI1NTE5IFJvWDVQUSBOZWtBQ2NDVmViYm9uZ2hu
+akhMVzNlQ0hiNWEybVE0dTFwWGRpMlZGZlZJCkJncE1nTlZTaEl2dW90bERnQUhO
+SWd5dzhYa2RMRVRFYS9rdkdEVTZIcVkKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIHNi
+OVZVblBBdVFuVE4xVGt1UzlMNDVtWGdBakVJaDVjanhmYWVPV3RXRjgKYTBOREpS
+bVowSHlySFg1QWJFK0pPdnZJS0VQcjdXdERRbmdsOUFTeldMdwotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgdWY5U1BNTndYYWwveCtjeUxHOERGTEhMMXlSSEpyV0gva2pw
+ZHNzSTRsMApQSm5BUmdMODZ2YmVaaFNxQVFaYk5KWFVEOVoyQjBQQzBxM2kwZEl6
+eXJjCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBVbG9ONlVPbW1QNmxENGJERGs1VEJU
+Q0FhMlowVlZVVG8veG5tUWt2T0VJClJPZUY1T00vZitSRmdhWklrY202ci9yRG9M
+RDRiTGpKWis5ditDVjJIRmcKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIE1SY3pidWpw
+TmVNbEV0ZXQwTDkzdEtkbVIwd1BrSG10UVhBRUY5VUt2eXcKSCs2VEc1VXhXWXBY
+UHdRVFVtaGJUK2tBWWYvQTk5V1dEcDVReFJ6WkNJdwotPiBzc2gtZWQyNTUxOSBw
+ZUZCUWcgVE51VHdqeEF5ckRqTUVGWGw5SGtkRGJCd0xoZzdNbDRUajZPdThCQk8y
+cwprTW9tU2Z5d1RVRWNkR2M0WWNCRTRwb2VWcDNQdHFCWDBHZDhINUduN0djCi0+
+IHNzaC1lZDI1NTE5IDl2LzJIQSBOZlB6aHRWRmthWkpuekNza2tBUzRiNGFkSTUv
+WVRNRGFKZXZ1Sm0rUDJvCjV1dzlyTFZxYndvZ3BKNGU0K0hwK2VhSmNYcmFHZk41
+RTlscS9uODR0R0UKLT4gc3NoLWVkMjU1MTkga0hrMmdBIC9sLzYvYnVpenRFUlZO
+cTVmVnBpLzIwNlJrU0xYOEhKWStkOGRDU0dkVFUKbjlVQTlsRnBCci9ucUNMNkJC
+WWpueFlqclA4YVc3RVpXeWZDQ25mWEE5YwotPiBzc2gtZWQyNTUxOSBJb3NBQlEg
+bjJNa0RIcGZWdkxCUnBsU0p4L3lwUDdia3Q4L0Y3cllYVGJuQ3pZcjV3UQo5SGxu
+SlQ0cFVOM3ZRZ3l0SkdVdk5vY0NLcVUrRXJ3SU5SekxaM1NWYy9NCi0+IEdTTEFp
+OSF6LWdyZWFzZSAoJmR3Vi4gU3A/ICNuLSA7Ck9ZSjhhci9nVjl1L2dIR0twUm1i
+NzRSOU1DM2Rwa3RsYnp4ZQotLS0gRGVpRXZiS2Vlc25HN1M2M0kxbUo0Uyt6OHgr
+Q2loS1MwVzB3Uk9mcTd3MAr1KliXDwBENE5rxqhvy1XX1d59XdiWeqCepnPm78ET
+YbVM6FN9H6UBwiwClc+os59UY1lxNyjvefVOfW4V0Jpo2f2aFWdsJxoJWSdomKzG
+N2wQ4Yq8ESeuz4g7pwxWB3RsTr0w6Rnzuf7D4Syg9rpX1pqVinFhLOki1aK3ZIdk
+tqhjkKFgWQbBM/6540W14uw1fPTIcdX8v5KHbTc9XyNA2MHamFc1GooYduqL6Ylr
+ij3hM7/z+TdXxGu3+kqs3Yh5MFd+ePB+LFgAqiW3gv9nD5RmH3s/x8Oip+RLpoTw
+7fwo8wgHByoDK6gz2SAOZ2Q/Px5YBqivleT0oVdrd/quLN5lU2aQt3OANTxzF+bP
+DaAWwv/7pTaLB7lyqCTSw+C+UmgVXmnOi2MO7ex3tImNzwGVQfZG9mc5k13ltwsq
+uxC3T9l8+fuo4iFUwCXfXlm3ZmcIcpjYE6rOlV4Y2EdmwwvwRhMljWf2OfNHlq4e
+hLtKvsHf7+pMAX0ZsZMig6KH09V/RtGUr9KBWVG8CABPnPJBIzlGZPJdmO+G5eAx
+cEUUkJzlcSCF6SDo1zG7QcT7vRSX4FjvOY579w==
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2github.age b/common/secrets/secrets/nix2github.age
index c9d7e37..f56d0f8 100644
--- a/common/secrets/secrets/nix2github.age
+++ b/common/secrets/secrets/nix2github.age
@@ -1,44 +1,49 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBseVJL
-VVAwTlhFRDBDTGFaU09FNlAyeUNGMVFZZUNRYXBuSFc2Y3hQcmxjCktqSkVrTzZq
-R2hzVGtnS05iY1NySGJRWHRySWJOVHFsSC9BWXNlMGlzTzAKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIGxGV0h4dzlvYjNCcVl4TUtlNVZwTlhOb2lqbkhpNmkzRXF5WVN0
-eWlaQU0KcGFDd1FGbXZMNUNyQzUrN3FVbXY2TklQWEg5M3ZVbWlhZmMrazBWaFhJ
-SQotPiBzc2gtZWQyNTUxOSBTcENqQlEgcnZXN2MzOVhxalA4VExCanZrNi80MndG
-eFdHWU9VaElCQ2NXNk9KazhDSQoyUUFkYVkzOHNCUWpPOVhidzUxY1F2SG4vRFZw
-M0U3NWxoL0lDN1U0MUNBCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBONmw4VkpKZzM1
-WDEyeTFQaldFQUFjQ1VpZklwRGhtaElidUxacUJuTURrCkJHOTFBbjc1U1IzVSt1
-bU9yRHdIOUdNN3BXeEpjZ0tBRkgzK1FiZU91Q00KLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIHczUm93SGhIL2Fqd3FBWHJOdUpxbWJHYnErTzNOM2NpV0R6TllsblJLME0K
-aGppblpKQUt0blg1anQ3QWJQYjBucUVQalNpR3UxODM5dFFkTlFabnFrdwotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgQW5sWEg5cHpwZ0JaVlJFSkNqNkJXN080UUNLVER3
-VDBDNEJJSyt0Qk5EcwpwNmRjK3pRbURGTWFEdFg4a09NYmplR3VWRDhhSnNoQUpL
-YmxWVHFWd0xVCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSB1UnYydUZHaE5TTllkV0Nt
-KzRjRGZvYU16TVdUT1VOakZjR2tIOEZMbERnCkl1UmFIRlNMb2JMOHg5SHNkTkJC
-UHN4SUVFcEpDSkhCNTdVK1NyYXJwVTQKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFFz
-NmVZdVU1RkZSWWQyY3IvN0RKU1EyZTJrWE9tSHRxM1NacUZ1N3J6blUKV0VmNldL
-eTNpczVXcjRyMjYxWjR3eWxqVzFXT3J1QnNqaDdQcVh6eDVKOAotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgajhxUW1OOTVNUDhyWnJVRmxHbFVMR0N1S09aMlBFdGc4R0Mw
-UEN0anlXRQpkM1BmQ3BhTDhJREl2bUo5akJKUUF3aDFIZXBGN2laZDBWUEdJSkpX
-cHc4Ci0+IHNzaC1lZDI1NTE5IDVhZHFNZyB4YWY2WStkRFZyVTVCbUpEbGlDY1l6
-cjVSeDJJb2JSTWc4amc5bGNXSDNJCmFmeEEvTU9XTUlMVXZCSFhyQVBkMVFZdVUz
-SkF4SWNFeFVldjJ1NFpqNkUKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIE45b3VuWnE2
-ZjUzRkJxVCtqaFh6L2Z0WFlUL0RBSHBXWTBsV0huOHBGejQKSzJoK2lhWllkMTNh
-M1ZmUEhaV295QytyY3B2cDd4dlRLVVA2MHFwRFhlZwotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgY1UwNzNSWGFRMk9YMkRSNWVGay85Y0dPNU10M0Zrai9zY1gzd0ZTakxr
-cwpXSFlITjRWdnVHK0tKS1Jub2dBMWpOZEIyWDZEMlJpNVE1aDZJZEd3WWFZCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBremFWbXBpcjFQWlozeVZjSlRadHU5Tk1BT05z
-TE5FeGJBblhFY1VpT2xvCklsVGdyYlVROXdjQjJhS2FEWmRaYm1IZnVla1M1RWtm
-OG1admZsTHF1MUkKLT4gQE0oXC1ncmVhc2UgQXsrCmpKNEk0WWFvMlgwM2FUazZo
-SE5Uem5rZUs4NXA1WGM1VEd0TVFuSHJoUE9UWnFvCi0tLSBXRittOG9HL1FleUo0
-L1JwZzRodFpabjdkcjIwcy9lMGszVWNxWXRhUHVNCgcHsIn1vTYVsBrLLj45Mvnc
-5nPyOSmszRYqTEZIObtB2q5z8q3zxwuymBHW6jbLp1NGqT0w3NHfd6t4qaEoVtAv
-jqJZ9y0gxnIMX16tA4uSKyrB06BMs2ad2vcmSjASX6rC2HF7svGvdXI7LIdGhqfi
-GTglZmxXlKO+mVrLopanrpiUKmmb7uZaV6wlgDXi04IqGlajMKJnBAlhW1+v/ue1
-8tn/VWAY9OJmR7hS61Jo14SrgfOuhYLmMKoob9fboruLipEqw7AP21o1VAyq8ARi
-ndky08LSXmQiGVRWhibqHmm2sgIitv9vsbnq8tszWTOdqh7sYLuclbzYXb7Ui/FX
-Rm2lsq3zZFJgdLhb4FH4Wn1uO2ctImw/lm2iojGNptTHZovDTnkvrqOGB0UGYK7T
-5auTTw1lc0xhESUfR/nDaI3ozgV9tcW8epaBoIG02GZe90Tm9I6GAiaV3heAG/DZ
-1G/DhIEJ5a5Q0cgHwYPrfIqZsLOACx3MeyJx4xtdnETvmXZEbgUbHrStDtwYq4lE
-o9iYTrNnjf/U7V5YmA110nq8MNQktwczu3/Rusd5
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBYU2N0
+a1MzODQzb2JUbjJyQ0xTbUxlbjhJOExjNm1JOFd6bDNNZEp1TlJ3CktCUXFwWTJ0
+cUZVUldoRStJRHc2cjdwa0szQ0VPZTBsV0NiK2ZmQUQybW8KLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIEk0R0lSUitzVkRQb2hQamt3cGdQK1ptYXVkUkdXb2w2N3VsY3hY
+emdNM0kKYXhod0FVMzJ4dFRCZXZBQTBJcFc0RWRsZUdqV1FkSldkVHFnbU50VlNx
+TQotPiBzc2gtZWQyNTUxOSBTcENqQlEgaG5Fc0VOUHdJWlFsRGtOSEwxM2RHZHdh
+anVJZWlOZ2dBRStmRkc5WU5nTQpiQzRwMnBIVHJoQldJeEdrOGVha1phbGRKZGZW
+SGZiWUV3Rk5XdGxUZjFvCi0+IHNzaC1lZDI1NTE5IEJZS0crdyAzN1A4amFYM3Jt
+UDNidlBaRDdpSTNLb1dmTDY5VDArc24yUWcwVGwrenpnCmoxVnlEMTFlZFhEeE92
+ZHJaeFJCY25sWTM4NWFnQlhpbCtodWZyeTVoaVkKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIENONGFuM2ViOHRGa1gzQS93a1RTaXkwVFlYd0tadG1nOFhra0VHa0Jua0EK
+OElXcXgxd0FuVys4eUZwSXA2eCthRFNRTWpmSDFLU0FqSVlCUDJSNVJCOAotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgOUtUeUFubGN2RUp3eGM4d1J3ejFaSXdaeWg4MnBu
+VVNmUE9VRzdUNThtYwpVazRGNS9GMytrOGdBSVJhcWJ3TDNDUWVOMHFBd216a3dB
+UkJmNmpSSkZNCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBFaUVFcE1aVnNrekwrZjdN
+L2ZYZ0JreGRRM3FkYnFzdlViVk0zajE3ZFVRCjA0OUlLczBmaEJMMC9EU0k1K1Vq
+Wmk4eC9wbXdvWG5UTlNMYlBiSTN2RVUKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIHdI
+RHY3U0VuekdYOS9FUVhBQlVtUlNQTDg1dEt3TnFzVzMwOTgyQktEeWsKRC9TUnJJ
+cytpaTRGMm5wcXFuSE5ReU9seGFUWlBSa2FxbHQ3eE9Idmc0YwotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgTmp6SnhHV09BbzczdmVoaCtnOFdYaHorNWpmSDQwVmtJVFFx
+Z2FTTnZWVQpnK0lTem9uTE9BZ3FqdVJ5YThmZ3o5RjlZNlhTUW5Zc1NsM2FBa1gx
+RGdFCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyB4ME5DK1BQUVFLcU1tYVZadG9hRVlM
+WGFnd2lIVVNXSTNkZnhIaDNNSUY0CnpiUEZKeTVHTkFyYUdaeU4rWE54RmIxVjhC
+NVkvQURrY1N6b0doN3MrYXcKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIFZraHhvbndT
+c085d1BFeXE5bGNWcitZaTBKdVduOGtPeVFRam1aWVpyQ3MKbE92VWFqVXF4dkZo
+dElDN0p5S0xXemplSzFWUlJaZ2M3Uzl4UlhmOHllUQotPiBzc2gtZWQyNTUxOSBw
+ZUZCUWcgbndmTFpuR3o5QzZsZzVBMzBnUlU5UGFoNFIrc1dYUmdCdHhYa1N6d2JG
+awo5amhkT0p3YytiRmFLc05GRU1hL3FMbEppd1Vpd0xCbXE2T0dLanpTQ1pnCi0+
+IHNzaC1lZDI1NTE5IDl2LzJIQSBUQ3c1Rm52cjl6ZzhQNTQ5R2NEWTlWUlVNWVJ3
+VndHUmg4eWIzNERGZWxRCkNRZk43YWUvc05nYWtFYVlZNjBQbnNhK3RXTjZJMkU1
+OG1hcUtoUDQyUjAKLT4gc3NoLWVkMjU1MTkga0hrMmdBIHJGTk5SYXlKZkx5cEVJ
+dUJQTVNkUWVkVCthU1c0eDMvbGJWN0dKU1dSeU0KYUVQMTFSNVNnZEFxV09UVHJm
+VDhMcElMZ2NRQWVKSXJITU53NlZwK2dPWQotPiBzc2gtZWQyNTUxOSBJb3NBQlEg
+YVgyMDhXL0RsaEFxSUhGTVh6c1BUeFgrd0lMUDg3blk0a2pocVJMbVZnRQpBb1hJ
+c3pBOFRXMG9kTEt1Q1IvZW5GR0F6UTNLU3J6QmxGWGljT1pzb0NBCi0+IHN8OGhP
+LTVaLWdyZWFzZSBKcTpVVyAvQlZYawp6bHZOYWpabVJhN3BNVEpQbDRWbUh1c3BP
+UXlsSzJWdUdPMHpuWmF2QjNQd0ltUQotLS0gemVvbWt5LzErUlpmZXFxQmpMZFVq
+czhiSVBFQVBVVFo2Q2hiaXNWQ1Zwcwrm4hQtiHjacGXqxDf8QBf6AdsiCFad+cAu
+RA/fKJMnq8zc6NUDkvEAxrWxFLpLD9amqaxgh5889mWstPGaeCQEcWfjO7jl2jsM
+duZsH2rtqfsaoWI1tsUiVKGtgprkI1TBwbtFYQ/aC+1AzOP4rnmuu4T/kIDbP+rn
+SlILVnc458dAsDIUO0vYzNhy7z6oG0Nf6TnPehPocIakRXoLSN0d7fYmC5GDD+8m
+v0ucVjpVlyXCyOHbl6COgLmz0HglXaQba+K1ZFWJJXwB3Ej/wYaS6r5rChe9RKJJ
+tlCCDfOmUC1BgNH2PbPsaDwVmPe5itsAoJrzvq2mR5ho6kTX0dAPnu6A50G2TkTq
+7OtmvcjVarHKO5mRLSaGKgBnxcdI9MPvKdLKb79mBgmp7lWbKqOfQL8W+mfdxWjI
+F6DEPQ478W7QF5tIWYlHsDS4R7hKr7DPBxGLZEhKUYl6UJd8BietDQ+Pti19uoiC
+1qwFIGoKGteEsW5HHfvxdp1hdboVoOh/MzwpksNqMOZIhS2aAr2EKQsUBB5TLL+v
+JdEKGcLiRuxqa/6mVuEw2iqUfSBK+A==
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2gitjosh.age b/common/secrets/secrets/nix2gitjosh.age
index ab9bf92..3abe011 100644
--- a/common/secrets/secrets/nix2gitjosh.age
+++ b/common/secrets/secrets/nix2gitjosh.age
@@ -1,44 +1,50 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBIVEF0
-WGFrRlZOWDdmTUZaVDhqcjZBRXNkSmI4UU1oSGF3L0tUcUdDRWhVCjY1QUpZNzFz
-ZVpMeGcwanV2ckJ3WU5rV3QxejJSalNJVXZaUUJXcHhoNDQKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIG1XM1k3N0VQMThSc0VGelNJaHBMVE9VS2NhWjNOUE14ZmNzdHlv
-SWQ1M00KUkpyMW44WjRpUStrMndNNjlQR2F3QU9QOENVdzZUNTd4dVV6QURGRTE4
-SQotPiBzc2gtZWQyNTUxOSBTcENqQlEgRHhFdFphSzNCSHJsbngrNHpaOHZnTWpo
-UXp4UmRNNXBRUUpZRzN2aFZtWQo3bXFxYlo5VElCSnd5ek9oY2lZRGJOVTF4WG1r
-UXdBekgrak9KZmEwZTlFCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBnYUp3Q2FjSkkr
-Y3d5dDIxdkFRcjVmREo1K2VLeWYyL2xzaUFOaTdKWlJFCnFENFVuS2NwdmVZd1or
-Q3lnRHEveXNibi94VEhHMnJCUkpqalMrcmZyWUkKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIENidlRXaGtnRFA0dnl4emtiMllBYXJRdForekRxZXJFa0pzMG82aitWRm8K
-N3dLY05nWVBxdFlyS3JNUjNvODd0RzNIcG9mZ3FnalNsWUx0RWM0bWpSVQotPiBz
-c2gtZWQyNTUxOSBSNSt4Zncga1JEVEl2OGVWU0NNMkZicmNOV1BSUkl6ODNHQ2lt
-NW5SRkM1MVJVQ05sdwo0QWpSeXBlOEZPenkxNDlKNzdZdVg2UVZMS3UvaWFwNGF1
-MVZMRDZTajNjCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBmRUZkeVpTaGpSZmJIbnJ2
-bEI1cHpSZG9meTc1dTBvVWpaUzZlVUZGbUU0CitkOGV0YldmMEkreDRvVGR4NjJI
-RjRhOG9QTGVCL0wxbEE0MGl3d2xMa0UKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFRE
-RkJsTWpwQXdsaE5leC9seit6YVpnTTZYdXJxQTdGN09weWYxSTNuMWMKNWRLK0tv
-R3VzOHgrMC9SK01DNXF2Q3JLWld6VDY2ekxtZ2ZBbFhFZnQ0NAotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgZjJ3UmNHVTBaaEN4b1BheTloOTJJSGQ1bWdNVGQyNWNHR0tm
-VXhRelRVWQpLdHdzQWgrOURvU1lZd3c5OGdubXRkcU1vUEdWb1FTKzdaUks2ZUgy
-bU9JCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyByc05UU0haQ2ovdE9JMTk5NGp1VTRr
-WUp0Z0M2SlFtU2lZTnpEdkUwUEE4CjgvWWhaZzhTK1RzTkpxLzV6OEI1VFc4c0sz
-Ulh0UVdBRHdVcWQzeFJBODAKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIGRxbGh5QVpo
-OUk3WGc5cm84NGRzYmpzWVlIVzZsZUFVeUwxbFJhUisyeEUKNzB4blhHT3hDTXNE
-bTFVTW9na2xVMndtcTJ3eitmbjZ0dFhubXE1UEQxcwotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgTXgvZGk5UGVvdndNZ0Rha3hIVDVneEg3MnpFd05rWm5peXZ5KzhTYTdD
-dwoyTWRNWllkOHVoaW95WkJGVEtkYW1EeURmbkMvVE9KODdTclZ1Nm1hc2o0Ci0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBoUk9XR21vdzZ2ekN4RnJHbjUyOURHOUUyRkpt
-UEpNRUwyMGNTejlhWndVCk5pVjg4Mk9YT09DNnB3NXNXTmRzRkZhcE5GQXl3UlUx
-K05MZW9Vb1NLOFkKLT4gQHctZ3JlYXNlCitLcnhqK3l1d3BBaWIzSjVYemcxb0w0
-czJRZTNvWUk5VEY1Wm8zTHVubkc0NzBFRytTSnVycjdMajBnUSt4YXYKZmh0Mgot
-LS0gQ0FGcVU1dmo4VzJoMVRnWE1xQ2F5VmMzbCt1SzdaRzZPVFJkeFJrbWJ1MArB
-NZEFsF9k3XK1GoMUCOdsNF2AOehFTcLfRkhRznpDFIRJtJN5N8JRDzvLvfeLcFVn
-5KpmOk13C8mZM0NFW5okxu+8M5POuq92TBsWmQO9L5yjN30upu9tquRRSfq3d3nB
-VBI5ikF9+Mr+DLtAUIiIRyR10sJIa16OSZc5dJXiK2qZy3hTFxzrpi+4uDCYk2Oa
-w0Xsx4RcqnACOPIL545Ug8gcInMoO5ClrOkYO+B5VhtTCWD/6Myqj9DR13agPgIL
-M/ofiaN0AA7GagJBLFC3djA+2jfCzf/MZZ7HA1AAPNIpnrkIihmgZ5KUkBd3xq9t
-pE8mbFEi5pOcq0Qm95SshSPYBfTQcRMKz+BWSQlHEfGxx/3eKSVWSbyQPy1NVTAm
-8rVLzXMqF+XoE/wNM29zHgEufwXOyfvYV8KG+CWG/sjM1SlqF4uH5MbpHFotyS3s
-Q7g554/3pJA5qRcZGXIbcZdQlseJwqH4PSoFgoqGiHL+Qv/A1K393Yjt7XgZBvgm
-EEkyRCFI2rxSOs+qdJrbey6CqvvJJXCgSZRrZZO2s+MFVIunC1rv9arL2KBN1Q==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBXQXoz
+bGYwc2NqNDBVYzVkeGxldnJxbjZ6elgxUmFoMFhuK0pvTTRLWkhBCmx4RUxONTYw
+VXZGZUtQcnFaRXhuODNQQjhCRmFtOG1TQzQ5Qk5ua0RNQ1UKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIHgyQjZBUjVNMTV6cG9LNE5NSFBMc0xid01PQUEyeVd1ZnBEaUVM
+Rjh4bncKVHpqQ09XVk5od2F1MW1namloTUVMaEpuamlZcWIxRmsyRVIzV0RYZGxL
+awotPiBzc2gtZWQyNTUxOSBTcENqQlEgN2s0Zmx1YjEvMlIzdElmeTcycEpNcHNJ
+UUM4RzBaZWJEYTNUK29vOEdHMApkKy9SSk5PT3ZaQXQ1UGFCUFFvVE95V0tBZk5v
+UlR1M2tEYWtMK1hSU09JCi0+IHNzaC1lZDI1NTE5IEJZS0crdyA2YzQzQ1J1L1JG
+MXFjbzE5eUhnZDBjNTJGOEZwOGwzSmsyRUZhQzhtakFFCjVQYzM3VlpWR1I4THd3
+Ky8xOEd0UE1hVjRRS2RiVmUxbkpmdGxLR2RLcWcKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIG5ybjFTUEZ5OFhpUkpVdnZHNnZ1eWZGYnNQeFFvaVNoQ1pVaXJ0ZkNna0UK
+cUx6OWtid1FRaTRLMy9EaGk0K2NKWE00UC9Ec0FsUDJCODJzNG0yYXJPTQotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgdG5DRTY0QzU4MjBXTnFWT0NiclJ5M0g3eG9HVm92
+M1RIdFdidm9hVlpsTQpFZEd6QVFjY3NLOWVXeDFTdXZPenc3L284bG12V3dIVzRB
+QUZ3ZmU0VldRCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBHQm9ObTBXWUh3YkRSb2VW
+ZGE0aGFYM3RkbURpYlRTL3NMek5kZEpwcXprCjFHL2JIMFRKVitiamRSM3dHNzlj
+ZENNZHFIOVdLS2ZOb29RU2FKd1NCWTQKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIG1z
+ZGpQQ1ZDSVdLVE1EVUFRVW9RZ0QwbVJPSUtIYTcveUdBaGIwb2oxbVUKZGRQcHNB
+WmJuN3B2VGVlUEJLem9ja25wSjlreXpCOEZUUnZnY3F5YXR1VQotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgTmtoYlhWL2YxZFFheEVCbWMzOFpwendzaFZsOEIvN3VzNjlZ
+cXNsUUduQQpacFI5ckx4TGZPRnp1RFM0SHJlS2hLMnU3NURJcWJKTEZscEpLVU5k
+MXVNCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyA4dFFyS1h2bWJFYXZFSkpaNGVkam55
+RXMzSW94NXZTVy8rRHBWOGl4NVFrCktPVWI3VUhWZGZtYlNaVm8xTHZiTk9FbWZ6
+OE5WYUhaTjAvQWFxWDdyQmMKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIHZYT3dNK2cx
+UFpSV2dabnhIcW5HMlYzK2UzNEorQ3BaRTg3NVJwYVM3MlUKeVJqaE93N1lLdkg4
+UU9VaWRpeCtWQ2V1bmkwMkJvbE56U0lXcEhMVE81WQotPiBzc2gtZWQyNTUxOSBw
+ZUZCUWcgMzJUS0hEQjlNTUEveGxXdHZGVlY5ZjNrZTF1QWc4eEhiUmVsUWRBc1FV
+awpkYXgwL0E2cUNvQzRCQlVHQWM0djh5RVJ0SFl2R1p5ZzlEZ2lZV2trTit3Ci0+
+IHNzaC1lZDI1NTE5IDl2LzJIQSB5bDh3ZTBqWE5wNWdVczhsaXFJaXdEZXVBSzND
+ajN3WlRVcmp4dW1FN1dzCkxMN0wzV3BIdHRqYXhmSzlLWE0veWJHVlNBOWFncFZ1
+M0x0MWY1dmM5TlUKLT4gc3NoLWVkMjU1MTkga0hrMmdBIEpINTFDeUVTbCswN3F3
+QXp4eWMzTUdPTWFGeENOWWhkTTl3WnRIdk5sRDQKWk80VFJGTW5xdkwzMDdaSGFW
+ei9RTTg5SFFVRktFYUlPYjNOT1FQSklZRQotPiBzc2gtZWQyNTUxOSBJb3NBQlEg
+ZVhldEpReS9jMDRzcXhrZVRhSGFCeWphQjBUU3JiUVVYZnc0d1FUNFUwYwpLenBY
+YXMxREFRRjZZTHBIUUwxQVplL3J2WGszNUhXSzhZL2hDNXUvUnI0Ci0+IFUtaS1n
+cmVhc2UgPnMjfCFtCjcwT2hGeVY3b0VBSTZIZkI2bEVSUzR0bzNQQUVjNkpYZTJl
+a2l5b3FNbmpQQ1F3ZTNDTUE5ZmNBbmhzZE1uam8Ka3BqWEtQVEIzOUFFQlV0TUl0
+QWgzU3QwdlRTWkdUWUNRRlB1Ci0tLSBaeUtEanlxcDV5Q0Uxa25hVnFiVW9KMTlw
+TElTNVdoWmxlWFNsMXFlY0VzCpnuSzzkIeZRg56GdBS2gOTaXV70O7kR/9F7deO5
+XJOWo7ES0V1Y3WqNHmCsWHiqHj/yKT3JYBPd5p8tPzW/uwO/4KKfqaG5xY3l01Uk
++zsFTkQh5xRP5vtQ5Q9ztTVV3hp4QLVsBLSwGHMiJyL2BGawLD5OsSehBQ26nU4x
+gmE2ZP8WWm2dCTGJBf/JQ7rl7+G54GRK6akWRCT+ZzL9OMA5u3dgyvE3w5Q04K34
+sY8WJIDaUm/Gr6JB3gHTfHaSsqx5NE69EZ2we4qdUW/ATeIa42NLPOYvShGzJdNO
+nWC1vemKsUUDR1KzfoZ6W5KM1Dl6f0IzC2e3gAztH0FtZO47is1Lx9jsbVN/FRh1
+aM2bk4LUfsH0CtVqRxEqVg1gXzB+ICe/K4xU8OB1g7uzTYS/rZc1KG2sHJ0fjXUV
+m0EdIMiJi4uTltakDrVGBKiNhQAz4V6t/kKkONvFg6wFoVzgm3kOxfRcryWfF0sc
+VDaa0kOnDFS/MuIsMENJ0XP5mTO/BQERY4m423nY7hH4Ud+kU9k8zQ3gdNIGwCEK
+1j0P61nlu6Y4lSO6UaNgr7xl
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2gpdPocket3.age b/common/secrets/secrets/nix2gpdPocket3.age
index ac66b89..206918c 100644
--- a/common/secrets/secrets/nix2gpdPocket3.age
+++ b/common/secrets/secrets/nix2gpdPocket3.age
@@ -1,45 +1,50 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBLcm5t
-Qm1tLzlPbXR5NDFHL0kvQUJNSUJKeStPZnp2dlkySEdKWlRKd3lJCjVoa3dOSmk2
-WXZGQjAxZGZjcjc0Y05za3NvaTBKK0NjZ2tta3RhRmJ6OWcKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIEpWMWtPL29EM3FkQk5JM0haMFlXVC9NL3RkL2x6RExCNThqTHBh
-bEU1eXMKYytkOFlLZkt0Y2ZoTzdQakZaWFEya3hJR2x2QmpzK0VWSjc1YnNjWGpK
-YwotPiBzc2gtZWQyNTUxOSBTcENqQlEgS0J1ZE1MdGduVStReWZxcytnZVFSRkRx
-YXNTbklVaFFVU1o4alZtM3B5SQpJTmNUZnFYWVpKeDJrT2dLMlh0L0ZBN0Rva0pX
-azV1b1VSVEFlTWR2S3pnCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBIUVZLWWRjdTU5
-NmVYVHN0MkFZbmxFQ2h5N3JzMmdrWFVOWlZsYkovYkhJCkE1SDF5cktNMDNiR0c4
-YndIS2V5akN2RmsybUVoQ2hTTU00ZmRqSWVJbmcKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIER2OWNNVVg0cHBRalM4a3lULzhWei9DSWg0WExBd0hJOHZmNzVGR2V3bFUK
-d0pZV2NHMHB2TktlQTAwMmlES25DTzJRQXN1dnp6SUhFdExoeldnV2JmOAotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgZnV4cUVzZzZhZ1pjZmVwQWNZT0lhNFlTcGZITWJv
-cjROSlhvaUFMR2lSYwpQZVc5MTlNSWpuV2NaVVFVUHhRNzZWemdQOTdQMDNKaC81
-NHZ6S25YOVNvCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBoSVBPMDV6M0JVSnhYUnlm
-bndQcnJsZVpRRldIS2QzWnBkZEtEczBQa0FRCmIzcVNpaGFyV0VGRGEzS3NyYTJJ
-SFhFNFoxMlI5RGVLZnNGWWYvb2d5OE0KLT4gc3NoLWVkMjU1MTkgRjRiYjhnIGxI
-WlFRaVg2TkNreUFxdTRFL2FMTTZtOUpJbUZza2wwWEFrQVpFeWcwRm8Ka0QxMjJU
-em5BSU55Zkp0a3VHblhvQktjcnREek5VeWxyTE9mbk1BelVlUQotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgcVBvN1ZiR2FRUHhmWkdIOEsvck13dllLVjA0bWE1NTBpZkp4
-eGN6TGptTQpZQ3ZFVFVnekppMnJOREllSDJudHg1WWpyZE5ISDQwRnBwUEdNZ0Uv
-eDI0Ci0+IHNzaC1lZDI1NTE5IDVhZHFNZyBKcHd3Mk81NEY2bjBxdVRjUUFGR0Yv
-M2R5bGx4ZVR6eVFGT1I3cVlVdUd3CnNGakdDaVphRHpRWXp6bldTSnhXVVFWbFlv
-K3dPYTlQM2pxcThUWFFvcG8KLT4gc3NoLWVkMjU1MTkgWmUxTXdRIHZXaVhiUnlV
-azVLU3FURDJUaXBvOUE1THJNVExjQVEvOExIcTVwZEI0UTAKNjYrSmVIdHVtVlh2
-RnBQUDh0R0pIUHV0aUNMQzBXWUFucE8xMVB2MHJ6VQotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgZSsxNzY3NEhiRW5vZUJjOFlJSGszekxVR2oxQnhKMmhsbHpKMkcxbXhD
-OApSTXM2bUdPbzQzakNJa0JYdUYxSHZud0k3L1RNSnNTTkN3V1lZY0VNL2ZFCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBISFNHN01aOGZ1RU5jcWEwaDdZa3J5cVVqRGJI
-ekdOdTBTc2FKZmNyVnhZCnRUNzZJSDZmaVhNZHUyeFVhdkZ6YzQ0RjBTUForVlBm
-bitEZ0t2US9sWU0KLT4gTF51QSlSVEktZ3JlYXNlIHsgVm1CIDk3YApKelBqYk5L
-NEgwYlp1R0ppKzhKL29WWTBTY1NKeWJ6QU0xUWJXYkNYZUNQbHg1ZEdhdwotLS0g
-NkxiM2ZkdlcyZnVEU3hESUlRbUR2NEg0QUtVQm9RRnhJMnFXM0lZSDd5MAp4Fjva
-VrFwqO1dSFFWDg5QPrBUfH95D/2x7HWQRN8eVLy1F2D5nylB2vNBQv59PV+B5FiN
-b8zGDXN5/0Y6Q7syX2uTTSpHuw3RiAd9Lyw+aSivoi0Rfzw70jCIImdl6dBvqYqr
-+g0+TMrYe2e/bsgnoavFRp3B1eXUFy3cUy0Rxsx+APjDQijdm9NX7uWtC2qHYcIw
-YgVbUa0ev3N/nqDKh2bc0lbOxiVLqPgP2ivIyTskLRxko5Mdbq4Vkl0I9PaQE/xc
-of4WGC1IQ9zpzOA1MKZWwAsa0NMYrEQA7mxU2hz8BQCSSglKIzE8b7UPBqHZEHZf
-bfzj4rd80NGBmCNvrBsGNVPS/xQOGriPzgqfDV3/1U30RNcplxy7ednIIOnFc+5t
-AixVS3EiHQWSer2I64NwJNKWD5FqBN2is7mJbYMogYxPC55KdG2nJluv1JO53xLM
-9n8iIh1K5FATzNUnqZefn0tPjwsPJpuk7l1MUy489KjBAA6DQlF2YfgcniYL5o5U
-Pj1ZG22qYIrijiAo8FyV0kOjJBFCsqxEuEv/umEXiDbFxLRatez0zf3jCpZjKWXG
-Lv/OuxOMGg==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBGdVY4
+TnVkZlJ0elRhQkRSMnlXUjNNb3BQQmVBbmhYYVpqOUx5cE81TXpvCmNYUG5rTjlo
+RmpNQmFtZlBwWXY1eDVzOFh0T0F3d210QWRvOEZnN3VyK0EKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIHd4TmdIeWdiTXk4QWwvdURNQ3NtUlpNZWpnT2hubUk1RTUvMFRG
+MUtEQnMKTEZBV1dPOXlQOTNSNVZVcXUweWZjc0RlQzFybE42Szl3WkJCOWszMHdN
+WQotPiBzc2gtZWQyNTUxOSBTcENqQlEgU0V5bUpxNTVNQXh1UU8xYmJLWEROTkRr
+UmtNOWQxbllTMW5BZzdNR1JpcwpCMExaYmpNbW5ma3N6SHBDR0lZdHljNDNlNHlM
+TTJrTnpKanIvYldhcU4wCi0+IHNzaC1lZDI1NTE5IEJZS0crdyB6UHBMWXNCZ3ds
+S1RQL25SdjVkRElKMjYzUXFKV3cyZFl5VlhvQ3ExeUQ0CkdGaGZrNGdZZ2ZsTUsy
+amVPVjhjMEg2ZkM1NnF0cTZFNGhFSGpYQzRNRWsKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIEN2bWhSc3AyWjlXWk80NTVpbkkvTllWbnJScS9XWjQ2RUd1OTkzMHRzZ2MK
+bzNETWVrVFdIQ0VvUEZSY0N4T2Nqd3c2WEZWS3JqZTAxaTZBaTlmOHpZQQotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgQUsycFZocFZPdUxQM3MrU0o1OGE3Rjh3SFlNcXdo
+MExnb2hBbHdoTk13QQppenB5THpDV3VXRHdZYjJJc3dPUW9qcFBydUs4ZXA3Z1JO
+ckl1ZVJjNzdNCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSB1MzRNMUwxb1ZESWJrMVdv
+RkMzOGJHYnhnOFdHQ2Y3cjAyemI2bDJoRUIwClpnTys1eEFlNkZ3cStndjFyVFZF
+eExaQ0JDRlhGWDVyRFNPR3lBRUdITkUKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIEJB
+RkJ2QVZsWjdqQW1TeVpCS0tpSTFiZDVYOG5ybG5rMjg0SWVTRnlwd28KZnJMVE5C
+M1hkRHc2K3RCZFRjU1ZyeVR2YXhWT3ExNGVRNGRMU1NrYk50QQotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgYmIwbXd5aXlFUUhJd1VORmxjb0hQWmRZb2lMZ2xBdXJaTmx5
+TEU2Y2wwbwpOZzNJQ2kwVUxBRVcrYjBOMWx2V0F0dWJCdnB3cXU5S2tnZmpQc25P
+NnZBCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBCU3QwNjdGYXE2RHZtNGtHTVdRbmsr
+QzgweFB6V0xyV0c1NldBeGR1UEVjCjBKN2pJT2FJeFZUNDFKRnJMOFBWRGRDa1JK
+UExOZkhwcW9WZWxqSGVwbkkKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIEE5TFYrV0wv
+MzlicXhsUHNoblUxa1FlSFlmMUhnYy90OXROUkIycWFFRTgKclNPSFdtVzF6Mml2
+KzJhK0hmWDIvUmFlSGVLQ3l5bElLY2N4aWxkNFU1MAotPiBzc2gtZWQyNTUxOSBw
+ZUZCUWcgOVkvd3dmV0hhUmwzQlFBOEs5a1hGUmMxRU5heFNaZWhGcDRYdTd4ZktW
+NAo1dGsyMUFlV29hOEt4R1l3S3Y4NndrbHVUR29sSkMvZ0R2SXM3TG9MQXI0Ci0+
+IHNzaC1lZDI1NTE5IDl2LzJIQSBTclIxdXQycVZlckR6aTZvSzJxY1ZmSVJWNk9j
+MWJBYkp0ZUtvNHR5Tnc0CitlQzZDUWw4M3JNSHVkQ2U3MTdtTFBGTmpLenR3SmRw
+NWFaNzFJSHZhYzAKLT4gc3NoLWVkMjU1MTkga0hrMmdBIDcyU0ZjeWREdFJrTEdk
+c2RGY3Q3cE0wdDh4SGRJUVAvSzR5WmFENWQvQzAKVTZraTduUVg2RHlEME9CcnVq
+MFpCbHBKVFNTOG1aUnNIWWJHUXg5T0k0UQotPiBzc2gtZWQyNTUxOSBJb3NBQlEg
+YSsrbmdVOHplU29GTzNMNVh2aE5OaENXWHE3SlIxa1NuVHI0WEV1SG5sQQpuQWJP
+MnllQkFSMDd3S09DNXhxU0pEcEFGRzZabGkzTlM4ZXBNWlRkMU4wCi0+ICEtZ3Jl
+YXNlIHlEWmUtSzZeCm56bkR2UUV0OVJGNENzRWt0M0NQSG5acHdQazJFb1JFdGdq
+aG5Lb3BtTUF5QmtKaXV3YVJOTWpMdnRodUx3NkoKNmpkeGw1dlB1NmFpUk1RbFEw
+dwotLS0gc3lycXhWZXBmd0srSjhPTW1vMmN2REs4TWI0VUhiaEt6ays0akJQSkhs
+UQoyTVD7Gbo16BII9fA/kbWQA9cLwAIJC2eJldhHa1Z+/nCLTYoolHFvhDF1kNNU
+Q1VUi7Hwh3WfIZ5U9S8Bb1gtesAXrjAVoa07IuuELmY8P1aVnhO1Dh1E9bXhvjs7
+T9Qz5iA0R/IcMGzP1khAwda9urAqjtqjgNJOO9tOnKGOfCuUDhsPVqCZAfag4MeB
+A/UbjmKvQuoMLnx4r8AdZB6hEC6OvT0d26e1EzT7o4C4nXYk4+ocvNY2kp+9N8d6
+C5qxI5juVeZenESlAxQKqaih6wUI5Hb7vlbMM3LvQqmSdwspOCYvji34LTzE2Vl7
+fTb9us7PpueVWLfzF2ea19B2CNZR6VWJ8d2WNDSGhoq80H5k9fawhq/PzgB/CLzB
+dArCKrT7pL/L4oQVXuRC+2dKSmOm+hlrWHS1rwWEbgA7iQV8MR7eaHjUKEpRYC/W
+0oSyCsBNRTJrTQEZfknGgIK9dAKM2Mx1rw/1AbPrtcJe7aHI0R1wK+bSgXOrYgWX
+78V0+RseYYzyPgb6LUwkrA1MAsMp3NqQFts50DZ/x5ZBrKGWyEWO96Sg6oMCz+Gh
+2S5P02QBaoTSyuhHpg==
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2h001.age b/common/secrets/secrets/nix2h001.age
index 0619a1e..07148ef 100644
--- a/common/secrets/secrets/nix2h001.age
+++ b/common/secrets/secrets/nix2h001.age
@@ -1,44 +1,48 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBzN1lC
-b1pLaXU3dWFrWnRvWFB6TWs5dTRmZFJXTXFPMVJHaVIwbklIRWcwCkdJK0dmNWpk
-MjloV0YxU3hNOEs0eGxKdVE3WU01WXNXakxIWGo2c29NRHMKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIDBDdG5BVWtVRy84OC9oRzErRzJQRzlGMHVvM2lLT1hrOW85dzF5
-UkNlRHcKaEJDZzdEaENEUmt2c3RzeTRMcHlubHIvS29IMXdDRnk2MEc3Tm4vdTNo
-YwotPiBzc2gtZWQyNTUxOSBTcENqQlEgNnkrMG1zVjkzdllZTlAvKzZJbld5THhQ
-U1k4eHBPdktYcFRJRkE3MFB6awpMSnducVhJSFp5NTJVWGxLRG1KV1BKeUZiTm1p
-czZNUVYwMkZaWmZEcWRJCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBLbENTN1dmRXBH
-emtwVlovelgvQlQrUXBDOEVabmRJbGhYai9vL0N3aldVClo1eVc0aWZjQUhWcDc5
-ajZPNlRDRWx4VFcxWXU0U09Oa3c3N2JXZDJhcDQKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIEYzZ3pYL0NzSGpzSC9DTWVsNWpEbmRvSmNHZjhwMTFIS3l6blgwWUNWbFEK
-Yms0M2wzNmdPbFlzbTJIUGdJdHViaE1od3Ruc0hNdXZtQ2Izc2tZQlhjNAotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgNWVjdjVZeDJOekFFYVdVUHAxUDM1ay8rUTJEWDZI
-ZjBQUEpDeUgzeEcyUQo0bWpJZld4RjhNZGRseW93YVRUUWVYNUk3SkpQUGFsWW5t
-aWJBQmZCM1I4Ci0+IHNzaC1lZDI1NTE5IFJvWDVQUSA5Zjg0dWsvTWhWUUx4QWNV
-N1JnY0hQVXg4cDZpUm5Ibjk3U0JjU1BzV1J3CnJWYmRjVlUySmoyZkpuTm16N0Q3
-bVE1ZUJtcFVLOXpWK1VGNHl5Und3ajQKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFZl
-Tm9aNUFtTEduc1NjVjRndzhUZlg4MGlBazNhVjlXVVhUeXNPMHh0Q3MKcmZ4QXlP
-R3FRQ3BkREVyNzY0U1pNcGxOTitJa3ljOG1VU3pxZ1N3WklhSQotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgTnJzV2o0Z0IySndpU1RXaXhmUVZsc2xoODZ6SGNlOC9FMjFT
-YUZJS2dFVQpNV1JBTHR6N1ZWdXVUZFB4SjBtVEhDUjYvZEVFSnNlYnN4S29HdkZ0
-dHlBCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyA0SHNWUHYyNHROQmJENXlwOW5PNHQz
-SnZ4QkV6dDR1d2JTVWJFZXFGQnprCndUYUZ5a2labUcrakdZaDEzRXBXL0JKVThT
-eFJLaTlBVEk1RGhIWHBDL1kKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIDNUa1Z6TFNT
-Q0FVWnRVMmJ0YTNLdDBOcVQxRmpIOWVaNU50S2VaQ1Yva28Kb0NtRWhXOUZtbFRW
-TFJWdTgvUlZNc0xibEtBS3hNaUtEQjBkNmM1YnBTUQotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgL2RCWmk5d2wwUnJ0dUlhRWd4ajlwLzBpVHRhVURLOHhKSkY0NzY4bndT
-YwpROHBKVGF1ZkZmcHVwSWhUUFRDbmxoT3JraTlaS2taMmtSZllDZi8wbC9rCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBwVjlyVXJWQjRZdmgvOVBwV3VZdGJXOG96Vndx
-RHR2WjR4REN5SklBbHhNCnU5djVvUmJuSGFleENRU053dlREdEVONk9SZlVxMzFv
-SSsraDVXcUVEWXMKLT4gKy1ncmVhc2UKMzdkdEtFcm5DSlp4STZqWFo4VFk3blpK
-Q1FrdTVYblZzZWJxUFUzYlZFNFF6TEl6dEtmTlFFTis4QQotLS0gMHgvdjZldUZl
-RkIvK0J5VmQvQ0FraDRvSi9XM0pheEcxMVY5b1BYK0UzZwrE+EOIQzbFUd9WT4Vu
-o0z9dOqnMnAfas9tVlRKUHO3eQGJ0XTJeOhd82dYfFAebfqIhdqWbYiBEdzAA6l7
-+fWiGspeGdoFXzOInrW3Dw28EDnVCXmHx9ZCjSnPFPTvtWPf3w39F5UED1qDXFQX
-tEmPPKe6NB/ySsuiQ0EJ8unaKDYro8yEUKxQfHeYcsksNXYOaLkWB9fcmQaW7OEt
-Vc1I+u2h3h33c69QAsMpkZPKzXyjeHqUNrwhh8d0DNIvzQyjc8mJD1A+ayZ57XBt
-9Zlv7NkT4FYdRtxsiUzDs9PqC6yohtbdWKZplrbxF/sgzOmuHpVJtytZ2jgOI4mE
-JCsPnLggFUTjyrWiIRteB/7//1uDY+rZmovnFEs1eNshZewSM3D6uUgwVB6FkfY1
-KByRsUKvO4UBAA1/y4VjlVVvLjEfCIAsX9WFvP3Vur4DuF+wckVfoFfdFfaC0LWl
-tMleUWzyHMjd8EZdNZ7e839678qPQFdVGQIXQObQlIvfWkAc+ZmneqT5xjopnJZz
-GgIkotEEyTLP5KGdXMe7VYyCQPVCFiZO9XvfMIcx4SIObA==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBqZkZV
+ZFlDOTkvSkM0NmFlOHlIak5KUkdEZnZJRnJOQ1hLc2pkc1pGODFvCm91Ulc3aEkv
+NTUzblR2ejRzM0I4TnoyYVlkQTk4d2RNSTRUVDJ5bzQwVnMKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIDlwQlRHSS9Nd1VZV1BRRUVRRTdjWGdKQ1hiRitPMi9KcW1JMEts
+eWpnVFEKZ0thUVhWbDZxSHY1eFQ3OHl1R2JzRDFRbkpnMkVQRGhUYi9oa2luaEtx
+MAotPiBzc2gtZWQyNTUxOSBTcENqQlEgWTA4bTNxL3E2Q0h5MWhnN0x1a1N2NWRI
+K0JteUdIVTY4dlhtc1JYQ0pFTQp1Y05ob2hRcVNhbzJpSE5ReE1hN3BlTEsvdUtJ
+STVRdlZCWW8vQWhOblhjCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBRYk42V20xZS84
+WGd5NWs0d3ZmcVdKNWU2NlBrVjM0OEdXRHlVaWRORlRzCjBZQ3JaOVFYazVDeHBa
+RVhieEZJRkY2KzRSZy9LOU50VGFiRWtsV1FyUUEKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIE5JNWQ3SHkzcXpGZEZVRVRZZC9GRVRvWDVvNHZkbGpEMTIzUjdNME9YMEEK
+UytTTVlUUUhjaGpVZ1lYV0ZETk04elYwZ1FUdGVlMURGV3JwM01qK1M2bwotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgRkNvUjEzdVRvbUxyMGQvQXlTU1NTM1NWd2tMdW01
+RE1zd1ppRGt6QndoTQpJckl2VitBR2poRHhmV3RWSXN6amg2aFkvcTd3aTRIRkxU
+SFBMSkVERG9JCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBFcStmN29VTG1jTEtiMTho
+V0hJUWFxemRrNnJxL0I0T296bmlvQmt4eEdvCkR0MFFORzExZlhDVXpYT0VlQ2xY
+SklsRkFMVDJzQkpPemQwa3NOYUg3VVEKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIDdF
+YXNFY1F5MElweVhtQjdkQTAxYWo5Zkp5R1VoQ2s4dkhnUmRwV3R3eVkKQlZ4dTNS
+QVlkR2FnR0pyQTlhSWRQNWtnT0dCbTE2YThiZWV5UGdUNFc0MAotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgT3luM1VmQm9tSG5majdWeEh6ODBLSm56ZFpSTUVmYzY4K1M3
+RSt3cGMwcwpLUWpGREU3dFc2NFFtNVZGSDIzem0xZGF0aXVhUHFhUEIzWGMzUDFT
+L3I0Ci0+IHNzaC1lZDI1NTE5IDVhZHFNZyBwUml2WFlKSFdnWWw0YXczS3hvZ1dH
+d1BLYWNpL1plYXhldDg4d1BHYjJRClZzNkx4S0ZYY1MzeU1aU3d0TlBhcHVvNlJn
+NDN0Q0wvTCs5eS8zTnFaK0kKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIDAzRk83R0Zw
+ckFzZjNuSHRpQjA2cEsvTnRKdDBRT3hTK1krWTA1Ykh0WDgKWjlEN0NlYjYwb2NH
+RzU2N1lzWjI3eTlCSXgyZUIrY2UxUzdwRVY1a3FVOAotPiBzc2gtZWQyNTUxOSBw
+ZUZCUWcgYmNEaW9ESGVaS21NQWlITmMrbWQrekxQZXI5SExYbE94ZFhNcWtxSzd4
+OApkMzVTSHBSR1BLS25vaFUyaXZQZHE1cDhrTmZENGZNTElINUxwUzNONzdnCi0+
+IHNzaC1lZDI1NTE5IDl2LzJIQSBqRXVCUEdEY21xblVXV25sTW5FTkxMTTJPL2pt
+U0VDV3hZRC83TVVnelRNCmZXRnYzS2NqcDNIV1k1WHFOVy92aURVVStDQU50VmZl
+T3lSZTNveWpNVEkKLT4gc3NoLWVkMjU1MTkga0hrMmdBIFc2c2lrVWZpbCtXS1Jr
+TFI2RFRYM1BNWEJjeFUzclpXTUF2OGE3MmFNSHcKV0dHQngwRE14VlZRdDJqTHhQ
+dTMyL0JMN3VRWlNRTVZka3VuelF3QW92cwotPiBzc2gtZWQyNTUxOSBJb3NBQlEg
+d3JwUyszcTl6TU1XVHA0d2RNb3VPa2I1ZzFqdzJyR0ZTTTIzNi9VcnJqQQp5VHVh
+TTBjWXgvb0daeWN0Ty9DTytRMkVES1hBR3M5YWdEanlYdDJSdU8wCi0+IF99LWdy
+ZWFzZQpnZHBVTGZvYm1sWk85SzVOV3FOZkZtM3NKNlFLdUxDRkxBTQotLS0ga2JS
+NGc3N3o1YjBOeEl0L3NVZVprNDA3VFpJdmt4eW0yYnJ4VWdkdXBoRQqosYCeWC24
+SETTy8dVYTN0kWZBhYxUQDb6mhHPZrLOmlNyDeambLNwpoGHGpxUy1vrYL5cOmBA
+pZ4lLKvAvm+lj7FCqX7+uhQi5FohVTm9bz1IsJcId82yf6lLjc4p7M+ww6icM0vH
+DHHsZ2ecQiJKOvf8BUGgAxBkkdy0MWVRAAtOAqadBRtaGB5902FOI0gWLyAyFqlk
++P/pHRfob8PlnWb7MTYsUVgIBtbV/hIcpSx7BIsPTsdr7yFirhfoC4giBMT//2Mz
+e7NGN2bX93pAUPWK2P/k3geArT1zJoFeyOpkyIhnfeXaA8WKb5juA/Rly4aGUJO0
+oQKJkNGg3DPQMAEwwaijjuz19wd3o46o5la+2L/Yx2fCPDcwOyYzh8wVdc2eq6Ab
+y3y1wlFfMLpsuBSENnCQTPCWimTOk2lPUKEjDtLXCtucwyd/fzjHCjF1iR5twVrw
+id5+60bFV73v2QsQ6+qnNRj2Ea+LRHA48NtQH4Nedv8xlhgqkR0tD8mZc6Xo65MT
+1Lj9suIPCf5L/j7GiX4MPDt/uptHJEckGMEo0rrwINBps7K7XrQLfw==
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2h002.age b/common/secrets/secrets/nix2h002.age
index cc2db7a..c69d953 100644
--- a/common/secrets/secrets/nix2h002.age
+++ b/common/secrets/secrets/nix2h002.age
@@ -1,44 +1,48 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBoVnFI
-cTBRRUdwSkd0eXBiTGR4bXlFcHBNakFxeE5VYXYxc25JeXNtbTAwCnJwdERxYWpM
-YVJER3c4dUk5aWhGeEgwR0lzUlIzRVdRZmExNmlqZUg3TVkKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIGhNekdERHN4bCtaYzdzRG1tUTVlMmUvZFQ3VG1wbmY4UUJ3NXBG
-ZGZ6UjAKQXlhQTdVL1BZK09zbDVmc3g5Uys5aHpqMm9zZjdqL25EV0Z1V3ZTNFVY
-NAotPiBzc2gtZWQyNTUxOSBTcENqQlEgckJOTHl6UFJjQ3ZxdGd3czF0VWl1VC9a
-M3ZaZWRuTTNPTzZJaU9nRWtWawpvYTNialcyQ2J5SmxodTVZQ2EySmZ5M0hCUWcw
-Qm10c3E4OVlaVG5jWUk0Ci0+IHNzaC1lZDI1NTE5IEJZS0crdyBhek5VUWdReW5a
-UG5aU0QzdVFZZ05xMFY0TS9QY3ZHZmFidldYTWpFckNrCkJCem5rY2hUdlpWdjhZ
-NDBDL0JJbDB0eG8weS9MNThEbWhKa2l3MGhiZzgKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIHB5QWEzWWJiWmxYNE1oYVpVeGgvMXplYjJrdHhwMThKSE9SUGxac2M0RmMK
-UlV3VGh6NjRLcDJkMllXRkV0ZUJyc3dyZlhXamlOMDVFK0ZkeDVJandidwotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgNXE2MldzL2ZlZXgyTmtzUVRFVXhSb3IrcE8rSkVo
-L0J6RXV3WVJnMnMzOApSSGM5M3ByUVlCNWZNV0Q5V00xaTQ1ZmpLUzJMQ1hQeUNa
-R25VR2N2MnRjCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSAwMFZPTDJGRHcra0w2cURo
-ZUIzQlNXY2NiWklvdmVGSWNqK1lGNHNyS2dBCnVBRG9qdHVEMGdmcnF1VWxSNG1Z
-cHVEOHR5NVZsdFJVcTJKSVYySExka2cKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIHVw
-MXVpUURLNUxaMzI3dERzd3dBTjZFWCs4ajBRRGxJNUQyZEVNMVpFejgKWndQNE50
-ZDZpSmVCZlYvUXlTb0lRU3FMMHhiRTJBR3ErS0lObUxIRzhKYwotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgREwrZHFRNXBHZDB2V1M2alhxaGg5RjBqWjRuNXpGbVdaQkRs
-SDVuQk9ScwpqWkwxTmVLbEdZZ2JiQWhydE5QejRKWm8wOTVRbUdzMGprT21LVmZU
-QUkwCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyA5U0gvK3A1TVlzbzB6dThscFlNSVha
-MGNxMjdid3VBd0ZRV0xlWFlROEFrCkEwY3gwOGdYanljRnRaY0lzeFVxR05PMHJa
-Y2dNcU5CWWgyQTJJOTZFd1EKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIFdTS3JUSEdq
-R1RwOEVGa2ZQcy84eXgrejJYSnZIUHhFY2pYZGJOYmprUVkKTisySUQzRTJ3RG1P
-bUdKRHp3TWpzMkdOWVdIODNwV3ZPem5UUTFHVFZyawotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgZFhXbFAwdVIwYVlZM1lPdFpLYmxEYkxCWjV4Zld5dmNyam9XZHp2QU1S
-SQpQS1FBK2ZJQUxLYjVwTG5QTDBFMUZFbWxuaE5ibDU0VjFUNXJxTWdocFBrCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSAvMW5uSVZFSUVyTnNQcFFDZzhORG1Jc2QzdHdl
-ME5mUnkrMzE5MzduVVdrCnJFN0dPdkpzN1dIVEVHY0RZTjQ5RlB3VVYwNklZVmZH
-eTVyYitSVUh4OEUKLT4gKWQoUHstZ3JlYXNlIC52IGFIdmpSQiogSX0yczZcb0Mg
-RjQ+dCcKbkxFOTdiRXdyNmpjRHlHTU9seG0rRUhhUE5MT3VXdVVUbGcKLS0tIEtp
-ZDBxTkppVk5KQnB4ZHFnUDB2dHc5bVh0S3J1NFN4VFFrSXlBV2JhMDAKSYuA1rcY
-xs8cJ38Z+SQ9o87+cS30u7iWvd2JjiEQvKVimZaqTLe9oT35atx7ZAUtNB+ViM6y
-MLJQT7DCuHbRhFxwmBC1oa/bJuZK0ZMyN0pjQ6fplk9qVvjwbr+NBgxzKlAft4bG
-tqU3VtgdR1KVaP+fB0ayJ1F8FbJK1SCrhSMWy6gMQe1haBJsVRqb/jE7WOIECgXF
-e9so3m8RoJKHLswEEGI9S621lDiPA81g0bsH7Xkh3spRGY1BRihU7rgjlsVNbCuo
-DOTjA49heOG93G05x6zWqb70uqSrExA9shmIKl6cPH4fyMpLX5QjbXp4JxdS7xzv
-QG1mCR7SNELel26Si0MNzrXXOMGe6Vtq3iMJhVIcHNKa8+TYXMEqXms8XUGMsVGh
-D6Cfhn8FvZZc4BiBHiqa0vl3AwUGaVx1OUdNg2y4Xt+pJJDBTF7h8bP9lJxYyfm0
-bVdJbmtg1BxSUWDr/VIuNzlARdp4YVOt+5iN+iQ8L0OQCSZnGlPsbUEHbIdUsnAm
-fMQlwNg5wJP3IMSSg61wpkNnS/K/t+6auKbOYoeUyyPBCGjbVeCn0mQ=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBLNmRV
+NlNNT0Y0cTZVY083b2U3K0tORkdxR0IxNExrL2EzWmM4a2hoUkF3CmlDWmVaY2tV
+OVVrYTBXeHpIM1lkOVBPeG9qOW0vL0hmSlM5OTVjcFVNUEkKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIEJJcGRpcnlSRGFtNzFlUWt2OGpxTUI1WG9zdzRZakpwUjkybW1J
+MkdhaDQKNEMrT0VVSnZKYzZscWNBdkQzbXBsc0liYzI5bVBkZC84NnZKYzBtVEZ1
+TQotPiBzc2gtZWQyNTUxOSBTcENqQlEgR0tSZVk3M0hBd3djZklhVmdOQk5lcXpm
+d2NoL2RrVk0xLzNxRWVIWU9YdwpXQk0yQStOY1JFNjF0ZWhkS1gyWGRhTXpkUGdI
+RGlOZlBLMnFaMGVVSjMwCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBBZDluVnlKQ2FV
+NFBpZDZJQmorYXVsV2lHMTdLRkVjSjZPNHhCUk5iSVV3CjdIU1RaaEpocDF5MHNj
+blFVdGJjR2hwczNOZmpZdElXSURLd3hpQ0xvQncKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRICtWcXVMLzdGOE5xajlBaWdoMk5lL1J0U3JCL1dZQmxnOFpsK0Z2ZzFvbjQK
+ekFWSVgxdjZjQlkxMTlCYnNPMWN4MW1YY0xSZFltSk83RXkyUmZBakZjNAotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgZDByMm1IanR4ZE5EUExyTnNNVVN1RTdTV1BJak9E
+TmZYbEZOSHNZbFBDRQo5YTZjcVBrbTExazV1a3ppQ1Y1NUZhUUNqWWhLaTR3NkVx
+YlpzR2xNVWQ0Ci0+IHNzaC1lZDI1NTE5IFJvWDVQUSBNMEt4UFIwb21GOHk2c25j
+a0hpMkRQVGhCM2NFWmNlWXA4SElZUlQ1TlY0Cm9CVVBDQ21PbU1Fd2ZCclduMjdq
+aXNuZS9lN0dicElXckxhZmxpRjJDL3cKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIHA3
+aTJ5VUJROE1PZXlGZjF6R2J1OVBDUWF0N09TNmRkZ0x0YStxK2ZTU1EKWDBkK3FF
+c1FCSHZvZW5YMHBVSis5N1pRTW83bnpQZGY3dTlOOGNJT011ZwotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgNFhxRTdZNm9OUm1zOGpadi9jckxOMnRhbzUwL09SLy9JRncy
+TTlzWUVuTQpVdUFtWTZhRStkN1F0cEh5bU84YW45YmxtYzlXR2NOdTY4bHRZZWs0
+RjlJCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBXdWo2c3pPY3hmRmp5Z1FFdERUUzcz
+MXRRNjI0ZVlLUzArRFhodS9FNDFNClZyREpwb1IxdG14TFFSVHlkTFNVOVlzS3kx
+M2FpSkhReXljSytVczR5MHcKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIGdIeFpXODY1
+QkM3QkNkMllnWXFyTlBpYjd2SkI5TlNoT1ZxSldCN2xGeUEKaU9XSkQ4Tm56Tk9B
+Y1l3OGozSVk4M2ZFejdwR29Sb0NsQ0xrMmZzai9DawotPiBzc2gtZWQyNTUxOSBw
+ZUZCUWcgUXVkZUJhbEJ1ZnFKSWRaVUIyK2JCcC9PbDZjQ2VlTURWMzBOM1loV2hV
+dwo3OFVtR1JldEwwSjE5NGJKUEVyYlBzTmJIYzBYSCsyWWU2TnRwaEZLeWM0Ci0+
+IHNzaC1lZDI1NTE5IDl2LzJIQSAwTkpuekFzUHZmWFdRSjRnY3YweTlWYlRjOW1U
+a1hXRXFPakRNUzdxVWxJCnhIYU8rUGh4dy9HMGUrVi9aaU5uL3djU2JrYktaaTZI
+QVlMc1VyaTUxTjQKLT4gc3NoLWVkMjU1MTkga0hrMmdBIERkVmp6eDBvZ2dXdURq
+WlNwZjJMN3FLVXJEa2taYWJjbVlLVXBsbkl1MjgKdUhtQ1RFS2Z6U2t1M1MraWo3
+VWFCZERRZXJPTjBNS1FkdFZtdnQ5T0pBUQotPiBzc2gtZWQyNTUxOSBJb3NBQlEg
+TUpKaThiUVJWUEF4aHZQMXpkdER3TzY3cWxWV1BEbEd2TVRkT2Y2MitqYwpsbDU4
+U05mN0xmY3pkNWtiRTBPSVgyUUhBTTA5cDc1aFJEUDBjU2owd0VvCi0+IHAtZ3Jl
+YXNlIGxgcisvJiUgXWVsIHZrIE4KCi0tLSAvREZvRE9zUlRIOHZpYUVWZ0pyQmlh
+K2ZubG02bjRjdmxBcVdLVENIejlVCtydnNICLzNyabsA6H8fhwkySlITewQ0vFBQ
+GvfvDobgKzac8kmjDDwiIBwRI+EgVznSecv+Oqi2sJaodIxGaYgvEh+FURMfYOPX
+K95ykf+R4bAowyG66i+mg9vthJU2O4v43R4qN4+0CVrArqhQp+ywNERsTV/2pU3f
+bTFAYaLaLihEFDjCy9+p/D5l33Ns54FYAtBtQ/Ut4VY43i9inE/qohM6vy1W1SgY
+THW3pLHvB6WlZvv4uD+IXK7GJXkedKxIuH0pGWLTF28aIlWTV8QYlCYpqpqaYs4X
+87oze8zgPCNa2xODkQnYUI0GX4Fg3vP1K6R4G4DtCOytZdDYXncEIC4+opOoNmfg
+xuhjELH+eZLXXRRd8PPrPTWXQ9CjPOK20vwc2To3Oljt940di6+886j2vFEBd44v
+A1cjFG+K4mQ9GvdAk98EgRVXasmXyKnRdc7kFym9EY7guZtoA0Bav7YCn2vMwF7G
+yLmxss4Wa7UA9v3GF270M/fb6D5u9qcDG7v41wYSldfaqSDs0Vw1ZfaGBYAXF5v7
+GgU0MSWaFyHej5xq5UVTlMtWh2YR
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2h003.age b/common/secrets/secrets/nix2h003.age
index eec72ab..01a858b 100644
--- a/common/secrets/secrets/nix2h003.age
+++ b/common/secrets/secrets/nix2h003.age
@@ -1,45 +1,50 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBVckEx
-eTlCbVRmM0loQmwzR2lyU2pudXE4alpWTjB2RVhjUFFBZ2ZuYkJnCk1Xd0NjSkZE
-UzBqMEx0ZXEydUhwMUVRaENHMzVhNEljTEF2TmVDajBjMzAKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIEZMOFEzWUYreURsN3FJNXdHajRkYTZ4Unhva2s3TnpFaVRqc09r
-RVkzd1EKNkpKbWtQYjhpemYvM2hTK0c4bHVXOGVMSnUrVjJMc1I4Z0tKc1BkV0I1
-awotPiBzc2gtZWQyNTUxOSBTcENqQlEgRHZiVU85K3BRNzFwaUczSFdSUlJQWFhQ
-bVV2TDdKd2pZblJpRmhsRTUySQorSkVmUFpvVUVULzgzL2pDdG90eGk2Z3dhbnpP
-SElZSCtuOGpxRGFhcTBBCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBMRjQ0WTk2eTdn
-ditINnhxa1hqS0FBTUczbS9vMjdmTHJxQVl4UW9iWUFFCjNGeEFEdWY4UnFNMFZ4
-dTkxTXNhdjR6SEd3U1laMG5mbE9PSXhUWnU3YmMKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIERTd05uZDNnd21ycDVBMG05RzFNcDlsM3RXSkszb0tra3J4WDI1SG5XQjgK
-VktnRURwNTJ1ajlhWGdnejRiUE5jOFcwTWR2d1Z0eklScDNDaWp2emlHMAotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgU0ZLWjRXSnE2SVJoQ1RWdE44QzBKTW90SXIycWhJ
-WXRnR2t6c0NrL2FoRQpGOThqcHAzMDEwK1Z2WFFYL0VQYVNDWlpXK0xNbkVlQXBi
-MlZsWitmdGRnCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBBek11N1FvbDEvYlNPbE9S
-dC9ZWUd0VjVDQmY3T1loelVFVFFVb0dwaEFFClVwWFRGT0RVMmluTkNDZDNuMzd1
-ejh2V3krWjdFREI2TllvcllTU1I0MVEKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIDBM
-L1YxZW4xQlJNTzJMeU5EWGhWc0ZLSDFCR3VaTHpjRzU5b2tidUlqa1UKZE5GcXo0
-d2VydEozSGdTZGtmNloyYmRIbktEdVZGRFpQdHMvN3JidkZsRQotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgb3F1TDUwV1BWY2tFRk1XZWhJZGsrR3VPeDFmK0VMWThTZ0VI
-L082Q0dURQpaK3BZZXlFNTVaOVFSVW4zdTlhSFhtRy9hd0ZxdUVHaThaYUtXRStI
-M3o4Ci0+IHNzaC1lZDI1NTE5IDVhZHFNZyBlWjROUk1aemlRSjhqcjZaL3dORElG
-UkRwUm04c0pXRXBpU3FTVXRpeldVCkdzMkJBdHcwZEVsbThpWE9KR3A0dlNUVDZr
-TTd4bk5zOWdXSk1NRXBTYTgKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIExKYTNnbkdT
-aDd5WFg2eGN2aWYwVXhuczZkV1NVaHhTdjRqTHJORDNkRFUKRlpqc25rT0dhS3Jn
-QlhtSnZ4U2tFdjlEeHYxYjVLOWNrTGZhMWY4UDlWZwotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgNFozOXR6U05vaHVHMkp2aktTLzNOQW5aeENSZVdqV1N1VnpvRzFQV0Vn
-YwphUkVLZTJaWUs2bncxMWk1MDI4Q1JkTm1Ec3lLdDdqTEhZYzZib0FTd3ZvCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBBcGlVTXpkZmNOTDhQcFFYcnFEK0VEbzNkbUpW
-bk12bm5PYWh5MlNZaUdBCngxdnVnbTlsSDI0WFVBK252a05RdnlQVXN0a2hPamgr
-aXdiZWZwaDFDOG8KLT4gPi1ncmVhc2Ugdmx3OC4ganpiWXAwIDoqaWgyCnhwRVdx
-QklhL0hYZUc3TUI5d0NzTUo2NVBLejBIeWNNSnU5OWhMNi91bDk3UUwvVUI5c3E1
-ZUZqVEExV29aYW8KCi0tLSBuZ001R1hYK2NuNDlRdnh2WUNDRVd5ZGVPNmU1bThJ
-bnJjT0NSQTZ5WFhNCsHe0BDr0YR4Tmx8Z1SA97bdCMPlUxJs1+pwe1RSBGbiYJJI
-Eb1UYBsQXie0OTJ+2zgKgzhmcmTDna6V07RuTyxPl8WFzVtJ8HOeyci8EKxWvc5t
-A3CvdvmDtTzxUXMd+S+uLbs3B8G+jh0zrJEIkzwlsHoASMK7tFKxJxjk/UfyNYwA
-C+5Ybt2aLMs2vZnSr4GSjeNLYWpVV7nVFl0QbYsjqF+xd/JM781tJ/vyXqPY7XS4
-zqfMimuR0fog9KnuPax9J4EZzjlOfmWkZZIbIFrlV+XiADrRVKWO6YVRC3jVUwMQ
-0SI2fuufiHCQgb7n3PdK3Hqm00SAau4WTNJYOtUruOxg2kSuVKW6UMjAYwllqdSW
-FfqPFrQjc8/B3oqPrTlB3WdKEutbD+N014/z7l9fsi75GjEsYpczfDQNCC3M2L1T
-3WLUdGcOzA4jjsCRHg50d4bbTXsnPtKFX1YR4+cvAsSDvdN4OgT3i4X8v9sTr5bP
-lvtLx6MVIu7f7bV6OH5EX6c/XQFHmtzz8a98uFyLusMSxcN7Xn4JHSXzcLbw4e3I
-yjFEEF5QNXBBPdB8
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USA0dTdj
+TDY2STIxTm8rbnNWS2J2VlZxcVRFYzdBRElDT2RUR1pRd2piaDFZCnl2d0xoUmg3
+OEs2bXNUY29RQWJ2WG9GMXIzZCsvcHRRUDFvRFl2elR0a28KLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIFJsbjBZbFhEanBaSW1BOXBwbVQ5eUtHSDRQRzJleTBGc3BlY0dv
+VzljVk0KZEg2M09TNVlvYXAxaEFaUlpkLzljZXVQUE53aEVLQlZXbVBpdEM2b1Za
+VQotPiBzc2gtZWQyNTUxOSBTcENqQlEgLzQ0MVpLWXMvSXkwTnk2VWFrQWNtdVJj
+bURKUzMrMmRqeW9TcTF4V3FtdwpVQmducWt2dkVPQklma3h0QVkwZk11cW9SMkxa
+Ykp6amg4RWUrZEpFb3NBCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBDNjhjTlovT1J2
+QXFPOVZrQ1ZFWUV2cnF0eFdTR3g0M3VFd0dvU2hVNEFRCjdzR2hZR1pKUkpJL3Uv
+VEdPNzE4TGtWRVpZeEROZGFNMXRtc2pFYTJoMEEKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIGlhUGZSUVhtSDBuaTF4a2pCbFNqUk8wN1NGT1cvbkVqUmk0cEVCTkhoa2MK
+OGZGdlZBLzJCOG0rN09BQlFlTm41NVh1VEdZWFRjVTVMeFBRMXB5dktUZwotPiBz
+c2gtZWQyNTUxOSBSNSt4Zncgc3EwWEY0dmZPT2ZnUlN4Sk83WkE1c0FldGhYclFK
+T092dm9rQjY3TEh6UQpFQlFTdXBJWVY3aUx6Y3lKVDBGQ3ZHbVJqMm16R243Z3VU
+T2lHWVdNMTk0Ci0+IHNzaC1lZDI1NTE5IFJvWDVQUSBuUTNLUGIwMzhKcVVyeUNG
+NmJ1WkRtdS9FWHQvTGROL2ZiUmxmVlBIQWtZCjZJMUduWVNQMXVZRk1CbjhCTnFX
+RkxoaTJuelV2bW01T0hiTHgvNTVZc0EKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIEl1
+SnJKZ1Bwb0lsN1dTZ1I4YVN0c0NaUDVEd2c4SjNTRkw1d0ZpaTF0RHcKTzBabFNx
+d0ZjTjNoemY1UzVBemd6QzNIQTl3b0N2WVdWUE9CV1VzcVVtcwotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgbGI0MjhMbDFZblFud0U0Qi9ibHhSMlJTa0cyRHFJNW1tcnZQ
+ZUNma0VoTQpuNG5ra2hwRlpneWxkTEgzQWlhMkRJVUMxR1RVZWZXWGloUEtkcWdI
+RlFFCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyAwNHF6Zmt5YXViL3o2aVVKVTNSakVX
+eFpuSHN5Ty90bGI5K0l5VFVtL1NvClBsa2tRMm1QSVlBNmJ6T2JlT0V5cFNmV1c4
+Tm5nL1NiOWtGWm95VE1Ya0UKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIGFwdWhWNnBQ
+N1lYeC82NzNHZ2d3TzBzUTcrcm0wWGNPdEc1cUtndTZRM1EKTmxadlp6WC9BQzhJ
+S2NIbjM4OHNpUGJiZkhOSXJDSitiNndOYm5VWDlCcwotPiBzc2gtZWQyNTUxOSBw
+ZUZCUWcgUTFOZUtZSFJRUkw0eE9wd1ZCcXd6Z2RvUFVsUnZBcWlSRXlHU0lWcVpH
+TQo0ZUszNFF0NUdib1BpZ1FnM0hBUjFsMHdSTE1ma01OUHRIWXFUMmJRbWRRCi0+
+IHNzaC1lZDI1NTE5IDl2LzJIQSBocFJ1aGpicCtUTjR5dEw3RTNya1dINTN1emZl
+OVF4Ykd2SmMyNUNqUlJNCkV2ekVCNk1uNEZiTlJYVDVsREQ2cCtRR3pVRVZZek12
+aTlLelNZOVVXZG8KLT4gc3NoLWVkMjU1MTkga0hrMmdBIC9aT0pJSEZiMTA4c0Vi
+dExPN0ZtT1BOY2ltNk95TzB2K0J6WEJaTUJ6bG8KdWo1OFpTWm1JWkRrWmhYUzRl
+TUFJTHp5Mk9hVXZSNXFHM09IZHZOblpqQQotPiBzc2gtZWQyNTUxOSBJb3NBQlEg
+ZUpiN0RMRUhKM1ZvRWJQYVNCVzROckZ4SDY3NU4xb1djcUgyQW9xRnkzbwpOZ2Fu
+dXNnTERuOHFoVVZGMUhpb2N3MDhRK29NVjhuRFhyZTdjL0orQXZvCi0+IDtXeHd7
+YFBpLWdyZWFzZSB7PCBcfkRZey4gI1d4Tn4gXwpIVDhGeFk2K3dOUkhBWkU3SnRP
+THVSUXBWTVJBSlZVWERqL1F6NjFYQUJHZitiWXJhYjFHS3lmd1dDVW4rWDZRCmxC
+bmt3NTUvZ0dScGFUaFJ0dwotLS0gTTRUejRxU2ZKZVN4MXkrSG52dHJzamxpdjBC
+aWo0a0lmS0xWeStFN1UzTQrI0E7L65ZYdi9LJwZ3nSgT7WwwQJovYBqw7YO8jE+n
+1iAUsxo+nj7V7ub7D6IxBaXupMwqqEGX/fUgLyHrckL8V6RmVfvoJROp1Vm7HncW
+xqoFr1cj3n6p+O+xQPFy+1uVSktCTvLgHDNHavRPaoT6vP2FcvQkI7jczbGJel55
+YBA6bLrMLsn1+MmY5oT61huymRbKFyt3c7+u/vqYwD9/J4/KPW7nO0hCQ8LBJEm4
+KFwj/6d8zyLFGRB+wwH3pEPFWZ17/7tK4xRR3jUw3ertMKnLtpYpI7sCOhCStH5G
+6CTMGgmWOyPmccVfWF3RSnuj5I53nnkYktWcc3o+ak8GCw8PBJvAfkAJyNjrSo6V
+QTMX9qsrL8SydAXXFk2lNcv3maH6RgRB9ycPGak/ZsrFP0VkMFpOLIfqjJMnfChY
+CUi2b1iTMlmw9VITSfgh82mue+bcevSaP6KboeksBq2ah8hSN80WPtb7VQNUNl/u
+cQT5DoyvaIxOstiVpBy7DY4pvb6c5iWkUuuDiHrn0AA4XB2skTNhGU1oty0YrDFB
+tnRtsOYgu5d/53Fcd8aUNg==
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2joe.age b/common/secrets/secrets/nix2joe.age
index ab6021f..befdff7 100644
--- a/common/secrets/secrets/nix2joe.age
+++ b/common/secrets/secrets/nix2joe.age
@@ -1,44 +1,49 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBjTXlQ
-U3c4VEZvT1JGS3BaL2Y0WHdSL2VHbFNZampiSVF3cFMyK09FUUN3CkdYcWduUG04
-RHozZG5UVVlZTnBWaWQ2a05nSDdmTzEwQktmMXFvN05pUWsKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIFdQdW5yRXY1bTZiaEErb09ZalRLbUV5Wk1VT2FLUjhYczJhSGc4
-RnZkREUKNmFsM3A1RnlVSXBqd2I3Z0tqMmlkT2xqUWI3YWVBSDB1ZDA5WVpQUGVP
-NAotPiBzc2gtZWQyNTUxOSBTcENqQlEgR1dxdGRIZGNuUU8wWmhDNlpUTVMxbzlB
-UGY3ZnhiRGUrQjlaN2tRM01URQpPeVNZc0pOdTNYYXNsWVV3aXpwZDh0V1Exc1hn
-akRTblZOU2hraUUrRHNvCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBWRnl6aWs1aE1S
-eGZPVEhsSmZhN0Q5d2RWZ1BKOWJvVmdrM3FIMktrQWs0Cnl4QWxrekNqODl1Z2cr
-V0VuZTQ3WGpYUVlyUlk0K0tPTzg4T1BJbW52aFEKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIGtEektrc2tDQTloMGsydkJmRERNSmNzbnNoYThHSWVTeXp0NEovVDd2U2MK
-TVlVaXJZTU9tbnpLNHlDUmpJNDFnUWRUQ0NMYklHN2hjem5IUGFuczhNWQotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgUkdDZjdDTkxzS0lYd3Ezd0RreWNyOUIreCtTelY4
-aEZqWktsdFJwVHBqVQpQeGRIY2dERTgxQ1pSTE5zdXFGcnZwZ3Q5UlBoWXl5Q3RG
-ZWU4WjR5TWlNCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBjM1hFSUk1M050RFdMUHEr
-cHd5MTA3L1l3dkZTQlpJR1ZyK3pGNURqWFFVCmUvZEhvcTFRTU1XV2gvdDBpWWcx
-T3dPUGhVdlo1cThldGN2akRtb3MyRGsKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIHVh
-WVloa0VSK241K2Z4MmtnZkVQVGptNVZoL2N5VENCWTVqQ0huSUl5anMKRHVlazdZ
-WmhQSHpMN2hReUdrNG9WdGZZNHJnQy9uTVhjcWlEYzV4b0d1cwotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgSVlab3kzbDBEV3dLY1FRTHdCMjNRcERpbWR4SEo1SURKRlFN
-MXd0WFVndwowajdGaXNHaUU4MS8xbU1OV294STFRelYyWVZnekR5RE9VS01pZjlo
-T1U0Ci0+IHNzaC1lZDI1NTE5IDVhZHFNZyBNdUdMaEFzUzlZZlhDUXI0OWliem5T
-blJMcDdsRXdLc1RydVVoZXdIYzI4CklBMlBhL1BVNWhJNWhHa2hPUldJUmxFV3dE
-QW4wNmlWWVRqQTBBaGJ1QjgKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIHduOUFtOCtV
-WDh2M3hHekFsczNGOCtRV213VGlvSDJFTUtvYjNodjc0QVUKSUlmc3RsWU5wL2Q1
-RkRPbnBBeGhnRDdxd1RMbG9sVE81KzZvSnllczJlRQotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgbHlSbitWVXdNZ1hnLzk3U1Q4aXJUVGF4YzJ4UllBTUVvTUxnVmV3UGlt
-OAo4STRlclBQRm45UWVOSGhvQ20yejVaM2VjL0F2WkpiYmlobEVLOTNQU29NCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBQOGxxZktqK1pYMkpmUUVwYVU4N3dUcTcxcjh1
-YUY4MFhwVVowVzBvbUNjCmdUWVptRHc0UGNja3V2MGNBOHpHZW1NQWNsT3RDdWFB
-a2hXVTJqeFh4K28KLT4gUiw4Im9XVC1ncmVhc2UKbWltYXFaemp2SjhpczVQRGl5
-NAotLS0gMVVrTUZOSGc2Nzh4VFYzOUxsTFRrNUZNeWozRUdDM1MxWEhXU0FpN24v
-cwrts/RxCDD6wySEPrydlQ9kqSgrWR039uzPt8Qp8eXz+5LPJEnzMZ5kkrODTahX
-UaE4M8m9w6f8edHtJTQzkujqNEDDkf76uCYKearh9DmpqAKSoxNbbtPiyrbyQFy9
-sD7zdBUiawt/LHYT0IfDGlR/giD1rRmyzPvmvpAR4lj7ou7zcbx76PJPZeCjwIj0
-CTlpOMK0/9jJ6g3iSXpNvQHpJaP6AOZdkIG131zcvRZP8YikKE+2OBmLZk/P+Lmq
-DgsHcY9O9UppHdciPt4i0WkSxCAwpLZIIfjmpAjFF8p2E1rm082GNyswQgmF53Kk
-StAMRtwW1ZI6ylHILR0YMtpJXl7pEMDZi+uZtH01o4TOlvgF2WuVlp9dIwHUfQyL
-TELLVmS8BZXQ8EDJtPpjrgJmuYTN0KaZmJKGrE+Dg0K2AoCsjySthDdNijJ3Ms04
-UFbIQsO6r8W6JO5CYCC36yOXwb7HupBXxYUzrlMnmZRniXWUJWCeFT7qO1e9M6El
-TqfC1v5Uzv+ZhXYzrZDOFXmFfUsEeUCzVR1RcVk3czRZabWP3sgfl5W9evwmnbVC
-OQ==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBrRFlo
+VzhEcDJmTStuQUxxcms4am9idGpZYm5HVndISDlDMzVVVGl1ejJBCldYZllDcGEx
+QVl6NU1vVjBPQXpLTndDdUZIRWJmMC8vRWhjOTRDUm5yTUUKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIHl3SGo5eEdyRWlYSmVZaWhJNEt0VWRiY29IN3AyeGdYQWtuKzRL
+NzJrVUEKaGdSelBON1JrbUZGVnJUL2RwZzZVWWJxVUkxUmVrVHdTcno1aWYvbGwv
+cwotPiBzc2gtZWQyNTUxOSBTcENqQlEgQU5Ia294NGsweUI2NUs1S3VZaVVEWUtZ
+d1l6WGdPcnBmck81UGQ1Kyt4QQpwUG5iaFVUNG43a3A3M1FvUjZGd3ZtZzMrTUFm
+amUzcHI4Smp0OXdpdWJVCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBFRkd4U2hvcGRk
+ZjhleWdheUtqVjBRMXdwZ01KY3cyck5tOCtBaXlBc1ZBCjNvUURFdEFpZ0VteCti
+Z2t3SlhRbWMxakRHbFlPMU5HZDlOV2R5d3pWdHMKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIFVZRlYzSU9FZUpoMnp6dVJPR21Zam96R1NQOXJQSldXOHNGYkZnR3ZxaGMK
+eEJvbzFKY1R3WTJVaTN1c1hnTWJ3ZU5OZjlZR1kxMXd5bmJYNDRBSWNqVQotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgUHBaY3ZaVjcvZXMxLzRiUisxMnNwV2hlM3NxR05Q
+aE4rQjJ5ZDl2eDcwVQpUM1NKNHg2UmtPeFhGbkxTUlFtTFJ5bjNSZVNEWmVKaHg0
+cWpmT1VZZFZnCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBKZnF6enhLS3BzUis2azFK
+VlFDVTZTRTQ0czdNclBGYzROUEJHYlpod1gwCkpMb2hSRHVFTzVTZ1dmM1Fid2tl
+bkhrK1dMdmxZSWxhMFBFM0wvZ2tuTW8KLT4gc3NoLWVkMjU1MTkgRjRiYjhnIEov
+MGpzVlFwSi9RUDlQSmNCRXRqaGNpSHFwa1o5emdOcmY5UFREejdtencKVHE3OGlT
+NnQxL0xJdTdYTnJQRTl1bjJNZDJ2MVdnWHlzb0pZS3JvYW1GbwotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgVVVrQ2ZJdnY0WHRrdFBidDh6ZGxCQThjMk1DcG1UZ1hhMiti
+WENKclB6dwpCZHRhU2NWZTFQYUFWYUxCUlBUenZPVDdQa3pXaVE3ZUdSNm91MWxB
+SGZFCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyB3QnVtWjlsOHJvVmltSkdVY0wwcmhk
+S2prNGg5UE0ydWdSck4vMFY2cFdzCnAvOUR6VWtEOXd3OE16ZVROMEJraXVTZHV4
+OFdmQlRXcStLa1l1eE5yR1UKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIE9NbklVa3V4
+aU5ubnk4WUJyRTdXRmIxT2YwODJQOWZ2eFdYUHphSGlwWFkKT2ZWWWF6eGc5YXJy
+NWNqNE4yVXc3MFA3eVJQbDd2Zm1FUkF3M25LT0FGRQotPiBzc2gtZWQyNTUxOSBw
+ZUZCUWcgNEZaNzVhZlVrS2FXTlRXZUZMcWhwNnVORGJKYmErQ2FIRDl2b2wvNDB4
+OAp3NWdNcjVXb2RLczJGdGpyaFo4bTVLMGk5QWNQbkJpMjh5U09kbENVS05VCi0+
+IHNzaC1lZDI1NTE5IDl2LzJIQSAwbXFvZWVaTEp4eUkxVGkvcWpZbmRnWGdjeXdW
+QzgvbzBnbU5KWE5Ba1cwCkxUNnkwTkFFdHpuRlovWjh0RVE3U3pIc0tVcXY3RTc0
+NjRaRnE0YXp4NDgKLT4gc3NoLWVkMjU1MTkga0hrMmdBIGtraTV0YWxFVDVkb1pE
+NHpVQ2h6VGh3LzVRTG02cVdGRHpmak4rT2h6QWMKS0N0SFpyY3lhYlZxc1NQbkZW
+VkVvQlAwejF4aUpnZmY2RnlHNDhQVHhXcwotPiBzc2gtZWQyNTUxOSBJb3NBQlEg
+dytPUnI3MW1TckplUDZWRUZrUVN0aXhtSG1OeWkrcEIvVitxOGR1UHdFNApxaVFP
+cVNrV2YxNGZQalZ1aTZLbjFYM1hWRkpFM2xhRlZTN3VNNFlaR09JCi0+IFEtZ3Jl
+YXNlIEVPUgo1b3AzSWtZdkdwWEM0bVM2cU8rdTkxMFpTV3BZUGgzQ1NwWlJ1UXMr
+dVIyMktqZjBRSzlrQkh2V1dGM3NoUQotLS0gSW9aS2RLNzZMQXlVakF1WDNzNWl3
+VEpQSVVWVVZkQU1FZjBaNHFxdmFzSQoHZa1y31EyfxcF5zL9Tp0efLfm1Ak/v9N3
+IqCds1BYhPDeCECA1zHdGZojhrxFuOyr1H/uSKuksPktfi0K7F73NsQ8Prf3hiVg
+C5Ckh540/7lv8Y+f6eOSlbUUHkO/UftqyPqPwl+L3cHApoSN5OZJz+nVgJROQMBY
+63lxHjw170/E1BNsf2jqdHHJUwyFd7hia212PqCQOyh0wbc+6E0t/9gDQXphBxC2
+/EpwLgBf0b8+nzGVZ0RP3wkegZyl2LYwkh+PLhRTTJOulE664eaJBFRpW/wfw1el
+QaoEHw52O92IE6KbM7lQ2ujmHYG2aKBf/u16DfkDBrHSplz9bolcueppa7ubLgfU
+mEacucUtRN2k+kA8S0UVZDsbo2oQfQL+fgq6Hcx1shpIFpugyhDMMHDD90cvAs8w
+Keg8jHbTEtVJAtBmLYraeyGXsla1vPCcoXfHr49ej3Q4B7pMmReMtMEP/BDKy6pK
+csPW/lebooacQpu1fjVyYyW/AgJHa0U6oZTr5i65FNYd0nQa07D3bYO3o7JUFZoB
+Ah7b2Pj3Wv5Uzxka0R13xtr0Ud7jqw==
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2l002.age b/common/secrets/secrets/nix2l002.age
index 78357d0..0866e44 100644
--- a/common/secrets/secrets/nix2l002.age
+++ b/common/secrets/secrets/nix2l002.age
@@ -1,46 +1,49 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USA1Q3VZ
-TEhzdjY4b0xCYnd2Q1UzemQxK1VsbmRkUlFtczBXaXlnL3djTFFBCnNndVNIVVhh
-VThZNHpWRkZPcTV6RHJQbGdrcERuYXFXeHdKQjhKbGZxYTAKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIFR6U3FoRk4yQ3Ztb2kzY3FEM2xha3M3eXBCVnF4WWVjd2Z0Z2Rp
-SW5lZ3MKOFZOalNUdm41YWFrQ1hXc1VtMzhWbGwwbFY3VUJPeWFpcmdmT3A1N3BF
-awotPiBzc2gtZWQyNTUxOSBTcENqQlEgVmo5d245MkF1a2g1SXZHKytFOHM3UXdp
-MWh3TmE0eFFMd1Nib1RFbTJVOApaZWxocWRyTGFJbWZzRlU1L2ZSL0JkWUJVaTdU
-KzM1MzkzaS9qMEFZWmhJCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBqaWR5SldpMWxK
-b3B2NTFVY1pTY1dWRkpEZEdlMXN4QzhSWnRiUllwM2xFCmFydTZuK3h0Y3JCSmIw
-YW0zVHRXOGNqWVdFa2lCb1Q1M3FNYWtsd1JJV2MKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIGY2elkzTm0xRTJXcVFKR3NHcEg1dmNrNHU0ZzNqUjA0endDZEluV29PRXcK
-RGJ0cStnSXhEa1c1TUg3eThyUTVJTDA5aG9uWmpwUnVRdjI1SmFtTVBHQQotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgN0kwOSt1OVVjWXhEMmMzejBqWkNaRXRDZ3FjYzBz
-RCtoQnh5TGxYeWppUQoyeDZVaCtXT3ZtRkUrbmpvcVhpRi85eFF0QUFwSEZEaFA0
-d05Ec3dlbFBBCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBZVDhjK2tsOTF1enhSQjAv
-VHJ6RXhWbUZQNEd6ZGV3bVI5VVdmY05tS0NZCkY1YUdsVksxa2xzbmlPdjk1YmQ4
-Rnlzdk14eDNrOW5IZERFcVl2bTgrSjgKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIGRY
-dHpkYituNGVrcHoxZGk0UFYvT2pvRlFPdTUxOGprMkc1TEVpN0Y4WGsKOFRGQllL
-M0N4bFkvNkNTQlZEN3JlMndXWlB1Mkp0Z2xSbkQvZFNiQVVnVQotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgSHhGbXV6UStLcmpqUHpoY0R3dFdoeEpoMUpPN21pMXJOTnhS
-VTNCTXBsZwp3eTJFc1FzT3RSbVFhZlFkK1F1eXpHeTgxa0RrYUtueTgrMnBnN1pX
-QURnCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBBUG9iejBJd0R5UVNKM1ZWMVJDcjJY
-N3ZuWjFpREoxcXZSVUs2cDhLeEU0CmU5MFpsa0s5NEhGOVR1UWVCU3hUalozbFFF
-a2tnc3I4UVlHRlhOWnVjREUKLT4gc3NoLWVkMjU1MTkgWmUxTXdRICtYS0JJR0lk
-b3JaakhrOG02TEVncHRTNVN1UjFCejJ2azF3TENHU1h3M2sKU0g3THZXMnFOeWFX
-ekNDSVhTcTF6SXo0dTVTSVdRUzhaMXUzYWJwNUpobwotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgSVBHTU11eS9jejdPZWVJMWpOOGZ6cVFIdmpiajRHeGMwQVhVajc4ZGpq
-MApwNjByRmVFem5Na0RabTFhQW5zd0N0cmJEOXV0MkgrQUlKZnRrUFZEWVhJCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBlWkVrd1YzOTdQK1IwcWxqWXkrN3RvWHJHbW5r
-Q2ZRT2MweFppN0hISFFBCmJ4MktacTcvWGVUSVYrNS9neVRPdms5WGJTaUxkR2Qw
-WUNOdUxYYU5lR0kKLT4gY2ctMi1ncmVhc2UgXWxZWSByYk5cJS1+ICQgeToKWWIz
-R2s4V2dPVFJxNE1lN0QwMUhVeTR0T0xiNmNZNlZweHp1S21tK09rYUsvQkFydW94
-UU9DNk1kbi9pVzlFawo4ckR1eVlWWVY0NzkwaUJ3S1d2eGNiRkN6YlkvZTNodC8x
-SlhYNytsVmVYT245TnM0NGRQWHVRQVY1SEgKLS0tIHV0YVBYblZ5WEdJZnMxd0tR
-b0hJRVlZN3ZLU0x1OGpGcWpvSk1HTDVOcDgKG0WYxcx4dLIm2aiV+k1e2ZCH6esO
-JLANoa6fl6nj8ea56EpfaJ/jHTKBYubFbXn3fhXizWj9lIvmmqkoZiCfACGVM2SZ
-P17CZLwr5W1/uXQwBaHuG35fejB6ipIg+QD+d5r4XQJIWik/fVAkuQxnG1PHIT9Z
-8j51dQD1mENRsTE0xFTyWS6jP/B808Ewvtm59Jf93yj/4KZMGohepb78u2L7zox2
-NDEEEPTFQcCXFBNCMuvpS2tViLnxbCXW/jyTHMnyTxIJwxdav9HjqTfH13flIxa4
-wSPJgxnK3rN1ppvoDempolIqXKq4r2o2GB4hf6ER4F3G4rH0QWNgZ6jcjOL7p1RT
-Fg0wBU3q7EoYlnvNGKWOVwK+Dq5DnPi2JuhNv1UvL/n6SER+TJUjBrukFeOd+32L
-v0FXa28a6Sa6A1e2vuDaJh+Nkq/sXrklrvj7Qa3hlEgl0aVDWqIftlnT4JqaLlE4
-uQVV3IsRLp0m3pX4uvk6EKvt7QahlXtfC2EPq94RIsLe9TFbdnnXexbFjIwLazx2
-Jp7ZN+b1POMFxLrG7Cf4/4L2sDmX516miPE=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBPODJ1
+Q2VxRFlMeUcrS0V0ZEhGdlRnRE92TDA4aXUwdDVKYUhBaG11R1NVClRUNnlJd1ow
+MkliL08zZE12bHRyaFZuQkszMU1nL2pxT3hIWWlObW5IUE0KLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIDUzVXpLblJLZmY2UHJnQ1FIV25WRjJEWEYva2RjRUFNbkU2TkIw
+Mk9hUTQKK2pMSytja2ppbE1Vb3hYVWhNMG1wUW1lNjRGMGpseVVpeUV4dkY1eTA4
+NAotPiBzc2gtZWQyNTUxOSBTcENqQlEgWmV5NW1rVGk0Y0VBTFJ1bEpGbVFqdEp3
+ZVhyWkpaWm1uUHl0L2N4WStRYwo5WE5LYnUrTldDMGQrbDhtTEl3cmZGT21FNkZt
+NmJ6eVBGeG5ZUjhCZE5BCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBVcWZqVVl5VDBP
+azJjL0p4VEJnTzJrdkRZdXNSRGpIdXM3ZWttWkluMlc4ClJOV0xTOU9PeHhMeWpD
+a0twcCtxYklUSjF1R2NseFF3NDk5eFI1Z2Z3Y1UKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIGhONk1uMk5xRVdFUGZhNkpHUWhMUTN5bkkxdzNTRExqOGlGZzdOZzk5U3cK
+NzJVSFppeGpGSWdob3ArTDhpcEhNSmVNMm8xcXRUS1crN0FubTR0T1BnTQotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgcmZ4MzRQQW03MWpwK2EzYUtaL3pPQmhhVzVBK1U4
+K3lOSDhNSzJreUwzWQpKN3BYSUg1ZmZQMEFyMUJRUU53bDJGZ0ovd0hoRWFOdEpK
+WVJUOGErZkFzCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBSblVTemNRb3M1T25yYlhS
+M3dLQ0oxZmhLQ1Nldkc5NVY4bDVMcWpPaEc0ClFDalVaZzMzUGxNN0x1eEJRUklQ
+aWwybzJhNmJNNkJBSkp0WVd4WGxEZEUKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIHUv
+ZWdmZ1RUZWZIckkzVENjblk4a0lVbVRzL3lDOFZhQk15SnU3REJwaDQKQVNncVdL
+R01RM2FQekJXcHdYb084SzRRVGcrcVdMMmIrWXozM1BXcFdJRQotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgeGhtdkMyTUQza2t2Y2ZGbmRNbXhFSmt6MGNNTWVGV2xGKzhN
+bzB6REhrWQpIUTNPanVNZXQzMHlWQUduZUMzdk51bnNqM3Raem9pRG9iR1FRRzBm
+aTIwCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBJaUM0QkV3M2R1czdwYy94VWlyb1Jr
+eUUxRU5zWU9tUGN5R2lMdk4rUFMwCk1ZMkJ1NW1abXRicjRkcE9CUmRqVFRjRlFv
+d2hHYmVKNTVYc090ditMYTAKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIEpFYTNQSDk5
+Y2JXL29YaTExc1ZiWkFKZUdFcDBjd1p0NWh0bkVXSk41aTgKRmZuWHRuNnpqUFNp
+OFVZeVhDeXJMbUxuWnBvQVE2R2NwOXFQYXNnOUFsSQotPiBzc2gtZWQyNTUxOSBw
+ZUZCUWcgNmlsV251TVpneWttdGVKVldSbzg3RE9ablQ3ZDhSZE9Sc3Q0VDRUc0Vp
+VQpXZ282cnFmczRvb1Q5cWtrd2NsdXBlejFMSUJwK2Z3Zmd6NEpNNUxJMDBJCi0+
+IHNzaC1lZDI1NTE5IDl2LzJIQSBLOTNlbFFPdVBMbElNcUtaVGVtVHFjTGJHQlFz
+NUdDYnRsbGJEbWVsdURRClVnWnpuT2dhUDV6dVp0d0FoT0gxcXR3cVJDL2d3Mm5G
+dzArWjhsczd2QVUKLT4gc3NoLWVkMjU1MTkga0hrMmdBIFIvZGVGTmJ2TmJxR2Vm
+b05RMy8za0liMGRLQU5XR25DNmladkgwd091Z00KTElBRTF4N29pbHVHYzAydVgv
+TU5BRlVJeW93NVFtZEkyK1puUnBEVUJhVQotPiBzc2gtZWQyNTUxOSBJb3NBQlEg
+ZU5EY2kyZWVVWDdEZDdZSUIxQ2lneWJrL1g4Ry9NcWwzOXo2ck9nam1WYwpRWlMw
+SEhMR2VHMWNyS01TV0RQSGJiZzNjWXRRYTc2U2w0QnhpbFZzS0pFCi0+IFBBQC1n
+cmVhc2UgXU0neTEgXkd1TDhHLHwgWEc+ICExVwpSanE3MWgrYWtEQ3JYbm9POE92
+cVVLK1pBaEdGTnVBMQotLS0gQk5Ud2dJZHRzN0RZTTlZLzdvTVp6c0pEejFBZU9l
+bnA2Q3hGcmVOT3NnZwopOnc+QlhQ9rs4u1VZzBGuVT1C/M1+of1PrkVrG9FspsTv
+k9M3NSrz1aCMHSgX+YdH59xr56PqsRjP6nok8+2XMMs04g/sfbQsBG6GIy0l2ke9
++RgoIQ/7yBY6HhcSfBK8OGHsBTypj2iWsXmHji+JJHgXelLBQxPhiPh721Y+aR/g
+6dhgaSkeiztKbzuXX8Y4idAx22vln+a9IhCeh9ObUucxXoQ7PsJXJqPFr4tqJfWe
+R2wluD3RtZxzbkvKcmiVvgJt2pRRoMPC5tn6Se2Hl08fDoTR9Z24wK5igtu0+rBp
+tALfNh62Nl2U1s4Ukd+5eH28vC1QEz9UqnTNvi7o+1usmLsMIjwagEgfUB+yzaT+
+8VJDj4Y4xfI5WdgbWe9A9JFk4ve8Xmqkkg8zlaveEg/wSMDbiZP5NV20xHDIr6kP
+yrctn77Vohff0iYL4Fm38FgJfODFCLsHYOok3OgGGySLdTZcYZ69yJjlDm5m47ea
+vz2zRL4m9MxS4vE9eR04T5G+isZnLZJP/T6SImvSKHKNpeXLSFbycRLYJkf0jNCS
+g1ym3Ql3lTyozQVBCg==
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2linode.age b/common/secrets/secrets/nix2linode.age
index f4c3cde..21529d3 100644
--- a/common/secrets/secrets/nix2linode.age
+++ b/common/secrets/secrets/nix2linode.age
@@ -1,44 +1,49 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USA2WWx3
-RmQ2M2ZMV3RDWHREVjhpUFI2Q2RoclRpYkpXRnJNeHlGNFlGaDBVCkNLTHN0WjVv
-am1udEhVZFllRThFNGg1VkFUbVJ4UmZ1akZhSEc5dk4vSFkKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIHJQNmZXRTBGUlVVak1rNjBrMDRDa1JKUmVWVGJjVmluaEVTZkxh
-SlRiVUUKSTlIdFV5VlNyNHVWdmUrWlFRejBabmNXMzl2L2hSWjVSQ2dobCszaHY3
-MAotPiBzc2gtZWQyNTUxOSBTcENqQlEgOGdQN003ajZMbUFRQW9QWWppL2hFMlRl
-UVJVdGRRVElFZG44MWhJNTNDUQpVZXkwbnd3VEg0UjVBVlFJbnVqUlVMaGdpYlk3
-WlRTaW0yTDA5Uis2VldrCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBTZTdkWDk4MUFm
-UDh5R3I0R1V1cEpHWU8zaC9PMlF4OHJ5ek5qc1Z4UHlzCk1MMyswWDBVaEFPd0Ji
-SWFyaUxDSFp3TTRMZFp2ZWh5bVJ0NzF5MUJ2aWMKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIFRSbFp1dEJFejJyd0hEQ29UZ0F4U24xRmV3TU1tSVRIaDVCSUVqVnRsRUkK
-cE9LU2VlTGl1TzY2SVE1QUdDOTJxcDBxSVA5Yml2U3JzQTQ0K1JXVFpvUQotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgR0pLQU53V1VQKzE3WlhNMVBVRmRHOXh5RzRRcExZ
-VUZndy91T0JOd0l6dwo1dDdESFZIS3M3aFZESUZzVjk4cFdkeEtCKzNrLzdnRXVz
-MmhmUkNiTG84Ci0+IHNzaC1lZDI1NTE5IFJvWDVQUSBod3NpaVMyckFyYWRtQnNs
-K3dPNUFTNVAvMlNsWEg0QW9nVitDREszSFVjCkVjUG9pZkhQa1V5bUpaNXZoZnk0
-MVhyMmtLOXIyL1hHS0Y4WTJDa2dUZ0UKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIDcw
-VW54ZzZZYjV4dkcrbEVEWGcyWUh5eXNsMnBRZ3VxSWVwdmR5ekdsVkkKL0pLMjls
-cnQwSU1XZjhhMkdpNzhkQkhrMUI0MllNZzYvV3RkbSt6MUovYwotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgRlhXeThTWDl6T09tL3doRzM1blJTWmhOM1dycDM5dmJnRStv
-bWlNUm9WdwpEblo5MVc1T29xc1Z2VGtkaXBIWHkyZUJnZWlLM1E2YXJIQWhKS3JR
-L2pnCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBWOVdpb1ExM2NuK2xjTGdOVTJuMzhT
-aFBqRTFnc3NNdHZPdWpBSzNSeW1VCmZGSFFQRjM2SDFhY2dtdjUvRVlhVzhzNDFy
-RjFTVkJCMk1RcDNvcFUwL0EKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIE52dnd2NFFC
-NHpSV3NNZlU5VlhpY0UycUl5ZTZYTkhSd01MUGswK1ViMHcKZVF6RTQyNGdRdmJQ
-MGRFOU1KTkg1cDh0N0pHZWNEaFEyWVlwWnpNUDdrbwotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgRTR5RjF5MHM1OXpSbTFmejUwd0hNdURsUU5KT2wyQ2dsNE84M2FZOVpT
-TQpsRkxLWFAwUlR4d21MNTcvYzBIRXRXM0lvMnlKZFNwUjBTeHNTUU5PWXEwCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBQcDk4TlBPaGptRDdrMmtIVGRJdVhuUjJBd0dL
-WmRzRnl5dzNlZnZkeXhjCmpBdWVUNXNsdHBhV3JFNlE1SzBCOE9OTitnc3NsMXg0
-azRSall0ZkZCdnMKLT4gLCwtZ3JlYXNlIGo0MGkpZiAwQFguUzRdciB5ZCdcUQpk
-dFZIenhXNlAzaFRDcWdBdW9ac2ZaL0luclhJa0FsZDFRCi0tLSBaOWxEVFRtanY4
-NXFkUUZLdFFxRGU1VVA3ZU92VTJPYXVaaE14UTJrNjlrCj9mpRaEWjmSyXiyEUl4
-r1Ix30lrwEBo90ppY+Lj3L5JmggXi5LnCkKe3gckcDdfJrFAb59YfJGHye0r19Ut
-v/9Ep/x7NXW80MAbmlPpqAqRAzR+o+X24dBGYeGGbjD1GAOizRicJnnGfcKhXAqs
-bF/A7GFSChLY+/qzhrrSiecO7rO3wJ8yBhqgKVzHawUuRmkNqGek6PVUIsC/qKnv
-Mi695NsEpZUV+mh6IuKZcyugdhYeJUKEsKcsBMnx0jSLYy50U29A3VfOqx/dNGyk
-MgrKRASfHikCevWRZFGHKUwlPmSyPx2hTjKaytywsNoPGKgzIlIwzdOjXAa3Uw61
-FnI+vFwco8FC7wK40cF5Am4WVUlcA8lwaga1NIbcbFuCpj10RUvw8IB/6Qh2uLvt
-YBhfQbWed/SPdefH1CBzJPcY9yOJAvo1ZnK24l0Ei5mFHyPUxBGlOX5CclGNBhiV
-D1F8s+H3AN1nHyAPkT3ZmCwA7YlnU8vP+9VbTkY4zgxDqn66RX9uh0sQLzGqWAYZ
-d+dskYNSgVuGocBCe7aIaU+pGMvIJIz8KMNEp88iNfb8
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USB1ak9y
+UTJwcVZCbmd4d1RPaWw5MDd3TTc5WU96MVptcVYyQVIwMzJDMGhzCkUrV1JQMlc5
+SnNxUm9UY3V2Tm0rVDV5ZTFLeEdYcG9qZWc3M013RjVpVTQKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIDJBK09UZk9jOEFPL3NXRmFaOTJjM2FlalRaSEhESlFSZjBmN1hr
+RUNoQmMKcXRlMGFnOXpCWjMvTGRLd0FmcDlQSmF1TUhXdXcrNXRIcUh5dEZqbDlz
+OAotPiBzc2gtZWQyNTUxOSBTcENqQlEgSnphbHkzZjU1V3VzTzF6K1ZkcVNvcmp1
+VkxhWDZPTHp5bmlxWGVTOHp5SQowZXc0OS8vOHYreEJXbVZudUtKVVQzR3cxT3RC
+RlpJNVFKN09kcmFtaTVFCi0+IHNzaC1lZDI1NTE5IEJZS0crdyA1RzdxQjVqZG5G
+UWtlUXpnT1FsODhaQlcwclFvZGZmb1pJY3MyRWtuZG5jCjI2QXFGMEFRVzR5MlF5
+QmNXbHQrOG8zbWpCU2FWVEhKNkhuT2JtNko2REEKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIHB3bXM1TVNBUmt2VFJPSEhzZjBZQVdVcFVNM3k5Y1ZCTmVtTHpObXZablUK
+RVllREl1eGNJUmIwZkhtUy9JeEo3VHpWRFFGNG5QbTZNdzN5bGpWeXlwSQotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgVmVqYUdWVFdYbThTUFIrZThYOWI1cGNFWTJnT2NS
+RHBzbnArbkM2YXVqbwpzSEowTi9oU3dnOTY2R29GODRpU2piRWFUSXFBcjlXanlR
+SlNZaEFCaWFvCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBFRGd1TWViVFRHQlhEd1NY
+RC9DRXJxUE5VazhkUHkvQWRLT3lrY0xaOUFzCndNUk1USXJ4eUtLQ3hjOEtLaXBJ
+emhmRjJFT2xreGRtWjlZaVo5ZjRLYTQKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIGZ5
+VUQwRlVnUTZFcXZ6ckFvQUhRZzJFMVB3dS9RT0ZOWm4wSEJGVExaWFUKYlFzSHNs
+VUhZTWJjb3doQ1hQTU5tRWQrTWhjR2E2cVlLUWltZGhaWWM1RQotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgK0I3MS80aC9MV1ZYZUkwMGk4VjV4Tml5OG5Na3dyS1JWM1V0
+a2FUaWhVZwpKSGJJY0RwaW5lYzUxc0dWaTlxdFBwV2o0c2lQWnFlQng4Tlp1bWtn
+OWhBCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBRVXJYMmp1d0RXNFlPWno4d3pDVUVD
+Vmt0YmhyQy9Zdk1QdmdweTlaVlFRCkEyVmttUjhZSDBaYk53ci9UbERiaDhyRGR3
+V2lpcFJBK3crTFZlVnBvNTAKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIGFiQ1E3bGlr
+bDVXMTNyVzVwNHdwQ2hnVi9Ld20wSnczeXZ4WVJ6MlZnQkEKOGlTUVVBZkVCOWg0
+N0tFTlNxZXFqaUJEellpRVlZM0JyaUZNUWV5dTRCRQotPiBzc2gtZWQyNTUxOSBw
+ZUZCUWcgSFhTUEx0N3FIVzAyYy9rRkZ2OUZBYWVQcmhnYWU3N1J0V2pEZktVQTIz
+cwpoZzhPRThka2JoY254VEZFeVFaN2RDVDBKZ09MUXI3c2VSZmJyRUMwYUd3Ci0+
+IHNzaC1lZDI1NTE5IDl2LzJIQSArazcwb0lLb1NxbTVpbFlKWmJWcXdnK2pXd2xi
+ZmpxNkliZ3RCQ3VBaUc4CjNUOFRJaG9kZEZFKy84ZTJ4aU83U1NEcWJNd3hJZFFY
+amdqV3hIZit2M2MKLT4gc3NoLWVkMjU1MTkga0hrMmdBIFNmNHFrdDlpb05EQlE0
+ZVhqcGpqNFY4M1Y3aHVlTUNOdnJ4VktxbFZobHcKTWd0emd6RFMxY25kbDlNM2I3
+Sy91ZVlOVkl6V3JqTFBuekFLMUs4NjYycwotPiBzc2gtZWQyNTUxOSBJb3NBQlEg
+aWFYT1A0MDBSMHpzb3YrNXNHNjc4dUtoNkZ1RHlSL0tWV3RscTlocUd3NApMT0FS
+MFZIVytLeGF1WDRKN0ZydEltVkxmaWF3TVdWV1FraTcwd0xzODVvCi0+IGY7cUxl
+Ni1ncmVhc2UgOUwtR28geWMkcTwibyB0LVU/Qyt5SiBZNzxsYEJEQAowTUVXa0Yx
+ZStNYWIwdzI0bXo2R1NWTURCMVVRK1F3WW1QcwotLS0geFBtNS9vMlE1V2Npb2lh
+KzgzWkcrNS9SRG1ZeC8zdUhQbkludVJwbVc3QQo1QQm19YZ6VMz/+vhRhATkrYwD
+KP/ZH7wMl9n40mzx5U1g87ERd3zoDyirTsgMn1N05fpnW24a71FKddHpDUuFc7Fx
+xLc0Xst+uuSD8lj8H309fBBLn6yfvq4vu+/XNqsUvTwkBVFRN6EkWTr0XoFTBrlr
+AwkEzL2hvC8Gt5U2sjNkJR9GLSZhwOFwTrFMZRW6ZcR42o+6GRUtFmRX7iUMKJ6a
+2LIn3i7Qlc8pkvtEWB8yHQ8iLxa0SbWPKWnMcTV8LK/JvhSebBHxx35AhbjZAwc1
+oLmichP61qIGUGb3r3Y5U1C7dWpAwMp12Z2efk1uOfO8QzM1GYqIRvsXSPzfB80w
+OCdnZez4iEIvxslbcLSRNZn1R8mwj5deMK4ZfU+26khzqBAtrjAA+tlCtViGKqUE
+e7eOBujnBz67YbUYFyepBd8UfDsqM9jtl3PW07Bgvi1MJY0S2dzopgTlzYnS3PNS
+8xyLi7Z/McMmHg5RZs2jKHScQlcs/+Y5y000UiqtWy2UmoY6zYwGW08eqgZLZKDS
+QYY/0MHWQGO469J3uNdCx6qkzPygWchlGEKpxA==
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2lio.age b/common/secrets/secrets/nix2lio.age
index 04e8458..1ea57d4 100644
--- a/common/secrets/secrets/nix2lio.age
+++ b/common/secrets/secrets/nix2lio.age
@@ -1,45 +1,50 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBUYWNn
-QVBoczYyQ2NuazFyRlpWdmxMeDZKM1N1RFlpWExkdm15UnFXSzFjCjVYUm9PNURB
-R2paemlEQnFLemJRWTlTV1A2MlgzbFgrMzlIT2o5T25lVFUKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIHJ2NEh1QzRVQ0gwWUhlR3ZHelk2OUhGN3d5SWIxK1NHeHRvUmpp
-eWR3ekUKMHNldDJGYmtUWkNvS1hWWnZwaGxUZUw2MWdhcWlNcGtBdjFWN3h6dm1s
-UQotPiBzc2gtZWQyNTUxOSBTcENqQlEgYXIzbkpNNUU0bktkeTZZMktya1FJT2xT
-aUhHNWxFWHZJVVNkOG5GK25qdworMWVUMTR6YUc2cmJKZmpVdE16ZDlMOTcxeWJh
-RlowUG5lZGp3TDlpQk1vCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBGUDZJK1VRQ1pL
-WlkxcTBNSWJ6M3krSHRCN0t4RFNTcDRxRjc1UkkwU1FjCmU4ODZoZU9kZmRrV2RY
-azhGdkNSLzZUcGVIRytWZ3ZXWW9ENGl5amw4dEEKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIC9nbWtEYUg5T0ZqV1NvZUl6aytoU0ZPeEt0anJobTdmMTRtSmNvYTNreE0K
-VUlKbTZrNExCdEdseDkwVVVzdFJWYmp4bTB1cm5UbytIekp0WExJMDhXOAotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgUXQ2TlYycUxtb0M4bWVLQ3JQV0o0azQvU1cxQzRK
-YzNkTEFndHdiU2tHawpXb3FyNDdVdGJsb1FMemQrdldhbll6bzFCTWtsZ3VESHln
-S1Fna3U5aWN3Ci0+IHNzaC1lZDI1NTE5IFJvWDVQUSBvTzFjRVZscHlmdjFvV0hw
-WDZ0b3V4Wjlndnp0b05uT00yd0pNN1ZiSFJFClpGMjVoM1dySGtESERpS3FzcG5x
-dkpRS0NLUDlTV2pDQzVITTZrMmxuczAKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFJx
-SGxlZG9nbmhYc2FFK3RUenBvdEp6MHhXTjZqQWQ2dVpySkp3eE4yU3cKcVZ4Z3hT
-cWVybUNGRW00S3BoN0lQYzBHYzR3L3A1UnAyenhwQTUxOXcxWQotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgMk9vcTJoZDByVndWZnZ1WUJ6UVZrNmt3eUZLNHRERm9NMlpO
-SFdibisxbwpKZGRkbVhHOGlwZHgzUHR4dnJ3RWgxbmhJeHZLWlFrd2hQUTlteFNt
-a0pNCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyB1aldWU0NSQUhBQVZYY1JOeVl4RmFS
-TU53Y2NuWjVnanlqOGpsZTZjWlI4Cm1jVk8wMUxyYm5DencreEFlaGVvS0ZHQ2JZ
-VlRaQVVlc0pDckRWQzM0R28KLT4gc3NoLWVkMjU1MTkgWmUxTXdRIEozZ1pRd0JT
-dEJ1ayttMzMwQkEzWkVYM2pMeW1rWFplSmduS3NMUytzUzQKMVJpM25LSFlpS01X
-L0FvM1lFb2k2eGlGeHpuTTR2VTVGTVRTUG5CZ1p4MAotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgalMxajlaMUFUWTdtTWExaVFveW5ORW01TzBxRVRWYmhxNUk3SVJNZXhR
-NApIVHN1L3hxM3ErMzROZkxuVHYwbjNCN0ZZMmwwM2kxcThqdFgwRkNSMTFrCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBvc1BxcEFCWVRBblE4TW56MFBMVENoUE9rSWJQ
-WlhycjQ4TnUwUE9XOFI0Cmh6TkJ4eGd6RFhzbDVZTDd4NEZ4cEM4eWEzTTU2L0lG
-QmJrKzFpZzBiOEEKLT4gRzlbLHwtZ3JlYXNlIE9lIGM4VCBtRCB1QUZhWUddCk8w
-RmtVVkpPQm5uT2xiZ0pGVEdRc2VBcXM4K09xMmU5OUgzQkdZRGMzUkd1aXI4a1Ey
-OFpjZwotLS0gMUZUbDUwVFYwV2I3bnZNMzhTNDg2WjIyWlE5UTVGMkMyVjRIYnZS
-WWlUQQrlJLukoKS9qcIcd4Rve1hfyGO5gHS6tp0gtLLO7OHAk1TMGBEidRCsWrIu
-7vJtuYigjPLEKMnn9SKJcIg3+/PveHkUSRQQmZom6ctIXbyDQUSa525Lp5IFjfWt
-GjbQTfF+rhFXL8kchIYtf9bLcLhCHDgTETNRElUB5BtrDmy3yw96fCJ5JP1YulR+
-DScffzLnyY9ByJArx/KXGDkkYQWjSN5bwFYSqfF3ks54nOZGPHbavLlOFxRftDtw
-Pe4aFxUFcu7j7+YPL30wZH5gPfFSS6AzgivFnMevd4BTrN7PGyu7AdKnbaFdrJkF
-nqoyQ5L9YX4q8wspzxyTVF5HcBubg3o1a3exWVNSm13ulg4hEs/FQ83fVfh6dfyG
-PVFI0rJw7YKbX/8dfH7DJ6r3cJ24EHMLAEcNMjJIp7fVBY+4uG4a9NAL5WwJQLoP
-R+aExrS/nsDYuqinvgeD0Fhfx/jejvbHYOSZfiMZ3FxoHgRDpkvtIpz01yh+a4Gg
-l/hv1Rrao1Af/vsgd7UsJFXazuwYKErNg72PejkWR8vKq0/N5lgF5HIImFWGAE4l
-bFllHQ==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USB3dHp2
+QS9lSENJbC9VR1RpaWYyRG1KQWFXVGFsYTJyU3VqNCtub2RYMkRvCk5pMitVV2xZ
+Y3hqTU9jSllaVXFReklodnVpUVVHeENpdGpBaTc2ZHN5Mm8KLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIHhIMGkwQmxYZjdBdFk3Wi9BQm12Qkh5NmExNklZbnVsZTdoZVI2
+bk9rSFkKMjZGc1o2SER1d24vVjcxVktjZmc2NXlJand1WE9zZDFZVG1WS1dNY1NG
+cwotPiBzc2gtZWQyNTUxOSBTcENqQlEgSEZhMldYaEFyUktESkttclBUV3JlSldl
+UzQ0T3MrdzNmS2ZJWndVMTJTYwpoazNQMUt3d1A0ZHV0bC84b282R0NlRzhuQTE0
+V1M2QVp2NXdVWTVpelp3Ci0+IHNzaC1lZDI1NTE5IEJZS0crdyBKRUhKZTgwSnc1
+YkJlb3FLdkxRdFNRK3gvTDVzM2RnRDdqT1g4b21pNnlJCmFwK0pGNWR6M3BNRmF3
+aVRHRlVrZzZ5NlgydG5VTkRqTkVnOFZLVmlaelkKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIGRrS3AzeE9jR05udXZVczdvaElkT2NFWkhyMGRLM1VRVmE3d0Jpek1DbG8K
+UHNJYlFrME5FWmtoT3JZa042N0pzRlFESGl4U0dJNGtmT1Fad0J3VGdkbwotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgaGd3SVN2MHZlQlhFaFFCRjR5eVV3Wk5LTE1PTHVO
+S1pFK29GRXRhcC9SawpRTE5BcTRIMFE3Y3NTZEtwa1V1cUlodzBXb3dUODJ5ZEVV
+eEdPdjRGcDNJCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBNanV1Qkk3THV6SVZCOEUz
+Q0NBSW16dTMzdWtpa29ncTRmd0o3eUVKb1dVCmFzd20wa29HVkRRRjhZMkFaSGtL
+Z2M1SzRPNHdRMG10MFZQYTRtRGZDZ28KLT4gc3NoLWVkMjU1MTkgRjRiYjhnIHcz
+UUlraHJNd3QwMC9Ta3cxekVCYWJrQit0QWhuSWkwenp6OUdBRG9oVXcKQk84OFpt
+S0RqcGsvN1FMMy9SaWpnTVlwT0VsMGltMzdueVlISWZDblJiMAotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgMVA0RzFwQ21YNVVBdlRuNWhRVjhaVEk2MkxmU21IeXp0VFNM
+U0RYN1pBawpiMWJCV0JUMFZNVWxROFByNXBBSzV5LzlxTmJxd211OHI2VGw4RTdJ
+WEZFCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBkU3RiRThocHh5QjRKSzJ5cVVIZlRU
+NlJ2VTByL0VQZU9DLzhPN1ZxVmtRCldWTkx6Ty8rbHFDT0RpNER2MVA1dVFiT2ND
+bzBsbHZ5d3hzaWlRM0VyYW8KLT4gc3NoLWVkMjU1MTkgWmUxTXdRIHFrNVRPQmta
+L3YwZjZ0MTNrK3lWeWdCRmF4MmdFMmszeTRlT09uVDlkVE0KYjlINldYK0VuNjBa
+NVY1bFg4VkdyQU9DRk4yNHpGREs5cWthMzBad2hwOAotPiBzc2gtZWQyNTUxOSBw
+ZUZCUWcgU1ZRclhTL2FkU09HcEtiNkY3OUo3Mmw5bUMwdisyL3JoMG9tSG00SGZR
+VQpMZ0NvYXh5N0gySHBMZnF3MC9oc1g5cC82Si9ybjh2ZW9XRlN1SkY5RXdFCi0+
+IHNzaC1lZDI1NTE5IDl2LzJIQSBUZTJXY1Z4a3RSNnRvaHFhbC9BTlNvWVRIazVE
+QVU2RTVrcU9NRDNERXhrCkdmbHJYM2xSUFM5TEs1Q0xnQkgrRnNzQndDRWlXQ05o
+MWdRRU9xQlhuNVUKLT4gc3NoLWVkMjU1MTkga0hrMmdBIE5tZVV3aUhlWEZkeHFs
+SUpTU013RmcwZzc2SlBlZlA0RERnTDg4SmVVVXMKbS9LZHlaNlRJV3dPRjFzMTha
+bU80WXR0SkRINGRxc2NXQVo4N2xqZXhDMAotPiBzc2gtZWQyNTUxOSBJb3NBQlEg
+SUtVNWZjY3o1UkJvbFZ5WStqWG9IMjMyUmRYL3FYbXRPOG94ckM0TUxVWQo1MFRE
+VUU5Wm1NZGQ3MFpRa3BBcWx0Kzd2UlMvOEM4Z1NoOFFYSWNLOWFFCi0+IHAmdml2
+V3NCLWdyZWFzZSBKKCklSyNAaSBSCnowSWtOYndCZmNoZ2gyYjNMejJpbHpNekZ6
+OStGcGFTVGJYeURqK0xYaUpkbFdLR01WdkRlMmY5UlIwVEQxYnUKLzNGUGJaUWhR
+T2hwc1RXS0pzUi9KUi9QRkdzVmRKYnJVMS9pN0pMdTZIck93d2JmSFhNCi0tLSB4
+K2RSaVBENkNwY3hWbFFJRzRMYVZSY0pXTFI3MENkMVVzRTJoYmdNN1JVCv7Oz2Fi
+S5/m0Lpgzb8jvETd0PIqOImElU7dg60vsww+++Ci7oo1Qw9l/bNdqOhIi4FjsGJp
+vQZz6OsqpvF7Ou+YauUvdx6STlnkwrh9J7BVSkG++oduf16bTsV1rqSE/e3hHe2I
+6rPv29MFmOxd3Ym4g+RAni/Ib/Ti7MdJJ3GDxOozAlHJrymtZ5NNa21UipoQpeWr
+QauxkectXbeVZ8dsss+1sPI/z0CYFHhsEyiKGzZv6LFkdERuTGRmLHfYEwpCeeuZ
+nJg5ztWBmvbwmbnbv4hbRaDNf5lpZA/sJV7OuJ/1iX2yuhBywI3808ioFtq3vScr
+uUusVwaktQTpoj7yr1OuUltgeuALegw/DwnzZE9mNpGtUjbIbMmq/vJYhH3rC1wv
+f2NuCvUN9GvWDt4IQkWDw7m3W6DUaNhoHE5NwcZ8GdScQ2j6IlEEdDAZ/da2Cm4B
+o/heA/LGRkgwldpABIVdp2rZAsoU07SgENteaWTk281yBBbiG/QxTHFzgxw0wNjo
+ShrXQQMnXWC2Fdz8ogj0RLesMsfjRnEIRwexxNLf0ihBwvet+JxKD6hL
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2oracle.age b/common/secrets/secrets/nix2oracle.age
index 2278f28..a25f102 100644
--- a/common/secrets/secrets/nix2oracle.age
+++ b/common/secrets/secrets/nix2oracle.age
@@ -1,45 +1,49 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBYMTZS
-OXc3eTFLNlFjUHZlUU1rSTZDL3VVVUphU3I0ZlhsVXJremNJMmw4Cjk3Q2ZJcXNq
-UzlHOEtpd2x0Q3kyUTBGbG80MzAwc0JFM2lDbkJ2TmdpUFEKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIDJsdlZER3RZRlVONmRFQmNjbldTVEgxNkZjaWZVN094c0d1V2h5
-KzNKQWMKMUZqbkxvb1V6bVhlUnVXd2xIZFhNaW9JSU9GYk9HRGRTNjRXQ1owOUt4
-dwotPiBzc2gtZWQyNTUxOSBTcENqQlEgaXhXa3BiOHI2TE5TQkd0ZXBDRUQ0QzNq
-TjR4KzBFNWF1RS8zVEIzZVdSVQpJUjUzcUtiY3M1QzFuYWJTODYwbnFkSE8rRXNG
-bDhZZVBjVlNLeTRGTGh3Ci0+IHNzaC1lZDI1NTE5IEJZS0crdyA4cVpaVlZBQ3NB
-SVZxZEkzUDZqNTdISjZtcnNWT0dHMkRFcit2ZFU3bUFZCjlxV0dib2ZvWm1jckdE
-VWpyc25JWThqcmJua0JOWUJIajZ0a3VINytpaTQKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIHo3WTJZeS9OSkIrajZiMmpxV3A4eXpyN1U5d1BNb3BWcFF1UDNmd1pobFkK
-SlhqblhqaG1FR1RFZ0dWaEV4THdKMUFqUnk2TldBUDFDc3RJMERkU0tYTQotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgSUMwYkZSR3M1Mjl6RkE4TFpIUzV2cm91N2lyd1o5
-TE5sVUV1aE00MGJFbwpQYjJKY3RNbzlPdXRGSnhtQUs3U3M3ZnJiK0NhcDJJdWhJ
-WUtqMjdCZnFvCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSArRjlVdjM1VXNiYlEzRFQ0
-L3prUlNFeXhsUG5mQmdGbWhhc1RqNWxUYURjCmhJQ05rWHdsdWVnYVVZc2RrbWw0
-b2JWYmxCZUpyd3ZmaEphQitqOU1TVW8KLT4gc3NoLWVkMjU1MTkgRjRiYjhnIEJZ
-c2pqVm5vc1ZtTVFsbUVDbzU2dnhXUUdSMzB3dElpb2loODVyTEs4RkkKNWFHeTFO
-MERZbXZmanVOVlcxa09EWkJzZG9QS2ZNM1VGSU5qcEVKeGJibwotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgYitZSXA4YmdnQWV0ZlFueEpWZVV2dTRIT0cwTDMwM3cyelpB
-RzdKenVUTQpDMlA1Und2S011L09ZY0NtN2FyTi9nakczYjQ1TkJKcENmWE5aQkxq
-Q1hnCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyAvRWRhMVNrdnduSkxsTjM5WUhlQXpK
-NENvYzl6MThWdVdzbEpzMmVQTXhjCms5b0Jrc09tU1VLSVdBQThvUHVWcUtLdm5v
-cmt0WllNdWVlWVJETWRocVkKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIFRTVzd6YzBJ
-WUI4R3NuVlFXNzl6bTZRbDVqY255dXEwSlFYTWFzN1JKUjQKVVl3UEtvRXl4aExq
-Yi9CRGljdmh0ZGhUR2xCVTNmYStodlAvNUNycmZtQQotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgUDQxbVRxMlJhaFQ2WHFYcXVwMHVpVkZheTBwdDVtL0NaVG41eGtEREFs
-bwo0VWRDZWZrMlhETnZEMU5BV244WE9UMExibnBDbGVlUXJxTE9IZFE0SlNzCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBNaE1hWWF6NTlvTlVPcmlhTnA4TFYvKzl2KzVa
-TCtyUlhxelhVbUVjK1NvCkNUKzhrOFVnY042NCs1ek4wQm5aNWorbmZaVXJjbVQz
-U0liRmRjZDNYRGMKLT4gbXt7dT4yLWdyZWFzZQpJL1RteEF1cXdYM1UwelM4aGtu
-UnF3d0hQaWJyOUZyZ0lGYWxUT2k3OSt2SVlCdXJRWmY4N2VPNk9UQkgyYy9RCkNL
-ZVNDdHpqNGw1c1BvalNBUQotLS0gd201MHV2anlJZlgydjkza0VpRk9ONm9HZnRm
-MThmSkw0dUZHUnVZa3E4MAqVUq6AXtNmLa++7a+A2SU7vyX95lsanWGrI1Jsp20S
-8WH1bYqXAp4lkQ1G9a7xBf5QNm77MLT9MD6zMU+qF0+uc7K3eZf+sGCiTZA18519
-Aftbwfqsx+NFifg0a49zb3FidcEjdQ+spXwUbsAoQuwHvVi4T8KPVQrvK829OhK+
-l/LV4PNK1v8guBHvEEv630PwslRv6utlXQD2CNV5YQfGY87fX3V0GVWodmka4Ou4
-eNQm1pqSUH+dq303CD68Z47wR1jBfxIvDCIMcyk/aAi/lyKHm/g1EB7m8atbNICq
-f2JJwdQ0acQJl7BPYiO7m6t8ZIqP46feKqqVgpKHJY5rmp6vlJ8TWFb6jcNtQNNF
-quF4Pa6ggxk+qme3Iu6Wac1nRGKa718+UvWuRg42ceB2d0E2ie5bJKmfzqrFij07
-bSAafq+6Ks9uF0TPYex1Sh2zAhlr6jwMMGCtmxmYR3zsE2gdv/rmF1Z3Nr05qIU7
-flpA0xxtc3yJcKc6eoeme+nSeQxDRkUGNTbAAWtc297rdyLfr5xtSz+62xNelCGI
-lO7eHxJxb9HgtAQRCErbGw==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBrU045
+Mk9iL1AzbG5LK1dKZEtTK1BENmZqc2wzWTdhMU9lL0NscXpJQ1dZCm5VWTh4eCtK
+QWhVRjU3c3NXOElYQVh5RUZUQy9jcVA1NG9EZEhpKzZLUEkKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIElhTGVrcnk5emJ0ME1hU2xXOTMyTEIxV1l0TVFrc3ppQjc1VTNU
+TmJyaFUKVlJrSVhCcm4xbHhwWUx5TXhlbTBwNzBoN21hcU1hVVZHeTNibUVSZXB6
+VQotPiBzc2gtZWQyNTUxOSBTcENqQlEgOFRvYXZFZjZJcXRsbUJUQ3U3Q3lLK3U4
+OEhiYWxqckMrZEszMXI1SStYOApzN3NCQ2U3TTkxVzB5dEUwWXA0dDMxblVEV3E3
+MXNXQVpKSURyV2ZmNDVZCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBJNUdKOGFDSHd5
+VDUrL3VSeEY3NWNoZlFWS3pvZnRBSjRIZEJnYzBSQ1h3CnpERHlkYXJsTCtUV2Y0
+RVN5NDB4UWF3Vm1pdzN0OHFuZ3ZRK0Fnd0V1cW8KLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIDU0aFQrN1pydWd0bkJLaE5KUTNyWU5Vak1tTlhKTDNHWHBJQ3ZSK0VNWFEK
+UDkyTkFoSG5aL2tBTmxESWVpWXRpbWtTeEY1L0JZSmlEdVlRekN4ZmdxTQotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgUXRLZjg3UStKMm9MNzFrcTVaVzhMR25DVk9oMGdP
+UzErclNkQnhiRnNnawpRY01QWnhFQnFqT1AwcDIyeDZiaG4yeVBzaUptQ2RMeWxz
+QkhyMDJnU3hrCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSArWjA3RVlZL2lyVjRFR2Zr
+b1FIK2Y4dlhUejN5Nm42VWV3Nmp4cTB0T2dnCmNXZ0d0V2R0RnZHNGliZ0pwNkEv
+a2Y4UHlmRnpOZ0dLZGIzTXJ0eWx0K00KLT4gc3NoLWVkMjU1MTkgRjRiYjhnIERw
+MkNqci80MXZibkF0Rk02YjBqalhhMmUxelJubWdQMG9mZE9lRzhXbVkKeURhVlhU
+bVZDd0l2bFlKVjBKYmZkdHk0OFFNNTM2YlNYWG1SS3pXS1V3NAotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgdnQrOCtiYWJrU3lveStlRzJrYWE0SEVHUEsrcm4xa0ZZNTA0
+UTZ4dWFBZwo3M0QzZEpFV1BFdGh4RC9DZ1l2M1FRWEdzZUtjbnN4cFRveE9KWU5W
+NVFNCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBSU1ZSd3Q3c1NWVUQyNTczMHBqMDVp
+SUowUkhwTEMraWZZS1l4Nlk1eFJVClBjcVYyUndxdjM4ekIxOS90KzNHMXVPQ25Z
+UlB1SW9BQzhyVHJnSU5TUG8KLT4gc3NoLWVkMjU1MTkgWmUxTXdRIDB0WkxkYjBF
+cVBuVFpiUFhmcGxwNW9BWmRzTU10R0prMmZsVVk2TWR3V1EKTHdySU8xK21hMzJ0
+c2NOZ0NSdHUzSHpnVWE0WU1DZXFjSjBXbHhvd1JDZwotPiBzc2gtZWQyNTUxOSBw
+ZUZCUWcgbGFyTzdIaWF2b0w4QlVVUVFyNnNSMklzVGNhM2Rka2FDNm16S0R0MTIx
+SQo4bkQ1cWtEVURORTcyREtDdUVPM3p6aFQ4ZVBXNWpCcXhUS1lOcG5tTUFVCi0+
+IHNzaC1lZDI1NTE5IDl2LzJIQSBDenFma2swTUdNalVpalVRT3ZCU2NyMlBOb2o0
+V0tCQ1gycmRoek5oMFVnCmNCRUlxU0F0ZmZyOXFLY0I2QXpuSTVqRUEvSHBHaHBF
+SENVeDIxcU94Qk0KLT4gc3NoLWVkMjU1MTkga0hrMmdBIGRjYldMZndtVGRuMHIv
+Q2RZNjlwVFkxS0xRQUpselRtS0l1MnNDLzhlR2cKSnF6MEdZRFhFOWtzUzlVZWEz
+SlpHZzYySEpEVW5TOCtiZTJIYWdLL3dYYwotPiBzc2gtZWQyNTUxOSBJb3NBQlEg
+bThlZVZ4Q2s1OEFWbGNqSHRIQUpxYUNEZzFzNE5qejVnTUs2djFOYjFHUQo1T2lP
+aktEaGFOYkw4T3JsVmIvTGp2WVE1dkxSczgzcjNaZDllaHRyVU1jCi0+IGo8IWFS
+RS1ncmVhc2UgNHtmWAp1dVJtdTRlMFROaHVzVGx4UkEwcGJycitqSTFvbVFFOWl2
+ZGZVWHFHMjUwTEljRnlDVUpMK0lBQ1Npc3VRMW1uCjRDVXRhdDRRRG93Ci0tLSBa
+U2JtM1c4dDd4OHBwK21jNXNqTFdDQ08xTXdWS2xLbjc3dllsUDE4MUpnCheeS5Ao
+jdiBXm9dtTEcTgilutkhBaP6NL2MI7TCkratQvinVxVFc3A2XXGD1Dp+/YGhHMx9
+x0l5flisRyCK3Xz8WJWbVi1VZ6DuGaossLHxfIeVWQhzGGlX/4Xu2Ly26BpTDLmi
+OpZ4WLHy3kMmt7VOon1xQmlZv7NBj4R4/u7QdPnIt60BwoDF6dGUEVBk/AcRnF2P
+23fA0ZlpmSCRCfyMwgdo7TXMq72w/VL4y50y0H1lgexGwsgtOwWsj0HeOxwleSCS
+3vHozKZd61AF898IIJh8/YW/A2AQkD0V+BN5Yn9A5PpN7HEQ2cQtsU2KB2LY7Ws8
+/l2diGyNu8V7CmONQh5Rjg5ON0Vj4xMpmsSQO9VyGzwVzkwXPpYadLYF82xP20UR
+IieybEz/3n6ihpDPJ3aJ6JN31lZJnCmFkQ2sgvizuxwQnIpuN5nVav8laq4Xjm04
+55r37ZJG4SQUzOMjYdnViq6B/LMslVf3B80vMKXlm/lc8cXXQ5ZErcKJs7WsKD10
+GsAE+kvrxpwBDykMNwluExFxYACp1a+1bZZuzdRITMEstbWQgBK36s/e
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2oren.age b/common/secrets/secrets/nix2oren.age
index 303cb98..a4d820f 100644
--- a/common/secrets/secrets/nix2oren.age
+++ b/common/secrets/secrets/nix2oren.age
@@ -1,46 +1,49 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBwV042
-d0xuRDdQUWtDV3JXQklzeHo1R1hQaGVsL0FhWWxGeVM3VjdZVzJZCjJRS0tRYmVh
-QnVaMzZEcHh0OSs0MFh1VWhGRFI3M2VxUGgyeFpGWno3c2sKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIHZZWUJPdzVFbGlod1hrYXFqVFhDYU96L2lJNUFMbzdqMEZJZTVE
-T0Fja0UKWFpDSmc2QUU2K0FFVlZRMFNya2FtcWJ4ZWkwUzBxTE9VVUpScUZULzdl
-awotPiBzc2gtZWQyNTUxOSBTcENqQlEgQmFMRHMyR1lGQzNLWS9Ed1FJTVVQayta
-MVVoVDRRU3dJRUpWenIzR25RQQp5TUg5MjBCb2lHT3UxeFVjSitoZ0JXZmZJWW1U
-MjZFVGdMT211ZWV2Y0ZvCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBkdEZVTGY3cFVU
-VEtsR1RjRVV1bE1VRmE4b1BBYUJ2UWZ3R3cvb3FxMFhFCm5lTVl2UHBZbjNTdkR3
-R1M2SU9idzM0biswOVljeEFwRStMYW5XRFExUEEKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIC81ZW52VDV1SC9BRmU0RVV4dmQzbGM2NTFLYnp0djJUVGNrK2p2dVhFMnMK
-OWoxT2xlMXpZK2ZJeGQrem9EZjNCeEUwNlJyaEFNaTdYMUloYmFQYm12YwotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgZU1zRWJWQjk4S1BnOVduUGJtbGpuK0pHS2dOY00v
-TVRyNVVSTlNuVllVVQpBNDRjbENPV1M4WVlkQThKMmNaRXRSODJueGtnQkN0QjZu
-YU5SaGZFZFF3Ci0+IHNzaC1lZDI1NTE5IFJvWDVQUSBXRm5RYVIveTR1NE1qK0JY
-Nit1dkt2NXhpOFN1bTJxQVdmNFIwS3N6c0RNCjRSZkJCajBzMnVEVHRSbTc5UzB6
-YXdHbnRWdTFQK1VpSUgwRUdzeHhwV3MKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIGNX
-U2VhcU5ram9UVnZlRlNZYnVhYW9qNFFCODZzajFpUmxVaVpXQ3dZbHMKd3NPTE9V
-MWk1My9PNXRzeHA5QURIaVF3djR2djE1L1VXMm5zaTc5azZMQQotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgMjFPdktLRStBbmJJK09nbFg1U3QvWDdDVGpNaTJ0Y21WSjVK
-a3I2SGN5UQoxSk1kN215TXZFMnh5dkJoWDU0bjRkOTJPNDRRaFJqOVZXOW5mdkpY
-SURRCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBxY25xajg1MDhoWTBVeVdDcU5oSkZi
-V0tQeUhtdWo3UkR4MHZHTlpIMnlnCnB1ZHFIczltaW5SNlNkOVpNT1pBYVRJTVRJ
-czJxUXgwUExHanNrZHFzZEkKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIFc1OFU3Si96
-TGUrR1BpdW9iVEVkY05iOFZDYTVuczZ5SzVBc1dMa0dSU0UKMEV4UUI0TEMwdll4
-N2ZKODliZHU5NStuNGFXbEV1bmZSQkdPcmpVUWxyNAotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgTG9sRlYydm53Vm1QclpyVVNCRzlJTWJBeHZCWGNKUXNNcXpVdHA2eVhX
-NApHc1MvcWFidWZIbVVrUmk5L0hXQjltMCtJWTk0T2MzMVlUOEd3U2YzRmNNCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBDRGR6OVVjczN1Mk9mbzhOUjY4YjROUEdBbGdQ
-S1VtNm9qZzRDbk1mWERzCklKVHdIc3ZOL21HbUFlekRHR0M0R0o3NTNiN1J1QXlO
-Tk1zZGVFUXBLU3cKLT4gfi8tZ3JlYXNlIDsvMFAgZWRSWCBnaHR3SmxjdyAlcgpm
-UFhycmdYMVZLVUVvVWNyOWlQTzNnOWlLVHVhZ3ZZK3dkQmNGOGtsZVpoak5mdHlW
-dnZjRHNIeWY1ckdtK1ArCllxR1BwS0V3QU5aUWxodkVFa29hWERJOEhFcStIU2pR
-MmxDRVR1aGlQMWtCaUlmeXJpSVArS21LOWVoZm9NTXUKdjZ3Ci0tLSBYT3pDZUVv
-bWpnYWdRZVliTW0xM3NsYVNMQVQyQ0xGMW5Ya2hyYk5Md1ZnCrnX8IOa8etI/DR3
-FwSyUqm+2TnMPOJzQQH2obofeyVIs6JfsUspW490t6/0Ucbcm+5/wATBHSQb3pSt
-lLoSgq9SBws7C9oyFB09GKcM1jbQILNTSQVYLK60lUPqwQh0yPE1+UuPsa2eFneb
-JNiXvfGtCMIf6AsczRk0olyBSkUug7ErTCyYLDR4MvisFXQ70jqEM4XPiVW3yHUq
-IWmvmr4IbDwJ8Omi/7vZEl7nRQvgxlmvJyvXr6r0DaKwu4mEIo6+vi7mrPi62ZP3
-RSJZLEtS7PJEHiiN+BwTFzdeBKylhD54lu2Lmm/IWoVxCohsklPwoEDvUnv+hrMx
-nqMk2vOHkXu6IBSwBH5v+4WPXlUdlZLhID2M6UagNwVXa8623hpdGTh6kvb/Bo2Y
-+VKbxAz7EA52CQ6E5QAVncHb4vMzBKSoURhrwd4UPyEWrUhg/amHe6uN6eenKnX5
-csBsqwziQ7MURVYLieGfPaaRJ1WfggcBAa12D4p+8KazHFh9OPG0vSpATBS36pNS
-Sn0BONB0w25emu45x0Z0A52jBz9tghkSf/J21McEfeAA3QAF
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBpSGZS
+bkFWQXAyazF5empVcGtuQ3NIQkpBK0RWWnI3WG9vOTdQMW9SNlh3Ck94MlNBSjRS
+NTA3ZjAzZXJtTk5WaTFUd0VYWFFseUVTOFF2aUFmaUtCbU0KLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIFZHS0Mvd2NUSHk0TnRFSWhmTk5VSm9LSnI4cE80OXpYMzJKbzV3
+UDdtZ2cKeTlsTGhmazNycElZLzN3R1FZcWdpK1Z4SGRPbGNKcjJzTnlXZFBJSTJl
+UQotPiBzc2gtZWQyNTUxOSBTcENqQlEga09qRnptd0dqN1ByU2JZL1JuMTVJNlNY
+eGYvRG96RXhtZFhxN2lpbWZXOApTYnNOYUkxWmMwZjlOMHJzZjdkajJHTHprbXlV
+aUFZOWtOT2dMY3MzYWFVCi0+IHNzaC1lZDI1NTE5IEJZS0crdyA2bnBFcnE5T2Jh
+bmc2dmRQRUdDL0crYXl3ZTI1RkFDSkw5N3VxT2k0Z0dJCkpsdnFjN2xQeXBnQmVx
+RlhTd3hudUNyMzQ4WlN1SGZvRldNNlBFV0ZlaTAKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIExzZGsvbmQ5NWRHdi9iSmVxVG0zbHg3T2V1NGFqREg1V0YyS2Y2bVNsaTAK
+UUNicjhwajgvckxIblMzNk9HUDhLNTFBSmpMdzN4VkpoVjMybWVIc2hpZwotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgNnJiMnVQcUd6aUVzblZMN3cwM3VoZXZRd2xaRlgr
+SmpqYm52OXozZnZodwpKMFdsMVl2Zm9qNkIzOU1MM2dmWGRJTFd3bzMwWTVBdDNP
+L05HUEpxRktFCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBUbW5pRVFHaUFlQ2JKZEEw
+RDJxUVhiRUxxMGNkczgzUGlBVmtiTDQ0RG1JCnhjZVdlcW1LYkZyOXBqSithVXI5
+YytEYmltaFdLYkl1Uy9IV0xTcVR2YlEKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIE4r
+ZC91UURXRHFUWEM2OTJMWjRuUTBDUzZyZjR0MTdlMGJ5NHBBV2lBbDgKcEN0dXln
+Z292L25SejhhVjAwdEthdTkrSVo1NzloSWlpQm5IeEgyeVQrbwotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgTFpMWnlXY1czQWpIdFl6SXpHeHg1K3hEeTBYdUxnREFmL2RF
+NUhFRENpWQo4ZUswdFVMZXdnMGE3ODZTRFdOc2hBdzVMQllvczMvZk04QnRoWDVI
+ME1jCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBUejNUVWEvWm8zSVFSRkFpQ2tIM3Vs
+UFdTVlBhR3dIL2x4aDZvNUJWd0JVCldXQjRVY0g4KzRhTVRYdzZoRWZPbGlPSDA3
+cUhNTVJVZmpLTmxwN1UwN1kKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIHJTb3dMQUpW
+b1htTm1JQlV2TDBXcGk5RzR2ay9JZ2NwSXpWUFlNeW1PVWMKTjV0S2JSd0dhTm02
+VzFzOUZmbXk4d2RweDRtREppZ2NaUmdXZXFQT2xPZwotPiBzc2gtZWQyNTUxOSBw
+ZUZCUWcgYTlGK3NsUUpJeW51SXFSaWRZMktZY1JVSWR1RHdxMkVCZ3JpOG5VeThI
+VQpmL2pER3pkVVpRMG4yUkpoNmZCb2NzMjBqcm9mWUtpd2JYVE9PR1N4S29zCi0+
+IHNzaC1lZDI1NTE5IDl2LzJIQSBqcjhlR0ZQK1V0eFJINm1uUzRRTzBJZ2xnUk5S
+b1BzTUVJdmoyWkVNNVVnCkZZM21DRkR3eDdWSHRtNTQ1WFF5K0hxMk1vMmd1MUJK
+ejl2dW1keFhuWHcKLT4gc3NoLWVkMjU1MTkga0hrMmdBIEpTM2NuU2RFVUJVcDB5
+REI4VE9LQzk5UEJVZEE3NTliNGRlVDhQSHZobWsKVlQwWU52cGErRHlMSUs5SllW
+YWZtZWI5SXJoSFk4UGxHVFFqOHJqQjhaYwotPiBzc2gtZWQyNTUxOSBJb3NBQlEg
+MFAxUXVaZXM3ckZHbWxhY090T1UzaTZpQTRqZXMvaG5VYTl4U2ZYRThEdwpNa25V
+cXp5Wk5WOEdjdGFWck5Qc1hjRitRMWdXd09CVGc3RDhxSVhlZkFZCi0+IDUxdmZm
+LWdyZWFzZSAqcik9QzxMXSB+UTsgX0hDCmxiUXF0YnRnamt1RC9IaDRkYnFsSHYx
+QkhRUU40TkI3MVFVSlN6WDJVY05KNDN3cGg3R0lVSDk4WGNQM2NFMEIKcncKLS0t
+IE12R3FidXBvMFlMSkl3MkJleHgwOXB3Y1BhaGs4QlBPaTY3aTZBSUtwYW8KBn0h
+p0tQ4FYu7/wPAIJc1Ful9XEfvky2NA1q4xI/gtfeaXvUY1tS5IeVkTQwfEsb6uCa
+2m/MRGsWSmfBYHPzBtl/eHNODZ7EHECHjVpq/i0BLOH5a/GJ1lAImY8MDT/1dd6S
+iqJPUTOWgH+mczo6BMsQBBmfg987oI/WRMeMAr0xZeFbunSw8yglLbopkFY1sv0V
+OgBBUFj06tBhYBivB42fmaFSO/bTYkwD6FSzCfUGSG0p8PPaMIPPF1MU9xtgjW5A
+PkN3OGeTDrDJ6AnVjTY64nzSEwILPRoSKXfErEX7Q3oEzSgIdzCVKUqt+Z9S8do1
+Huc3JOc7ZxxotGr9AHPPGYxT6hgkxxQOIrw6W03wnj6oS2XsFoU3X7uATZP5hc8o
+p2W0knCKHPjqxb0cCZORSdae3FOQpF3RY3hFOIHTHqR3dfl//D/OdW+9+qZx47JW
+hoXDNmdrBjUXW6t/i/rRhcoocomUxo/rLbxdE+/JP86Yg0pb0fPEP6zCMHJusuHo
+EojSeWMeRHZ+cF61ee1+8cHGrvXcShJ7uicIXRTFdbdclfM10to7cijub+U=
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2t.age b/common/secrets/secrets/nix2t.age
index c18ef5b..843600e 100644
--- a/common/secrets/secrets/nix2t.age
+++ b/common/secrets/secrets/nix2t.age
@@ -1,45 +1,49 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBFUzBx
-UlBLTDA2K2pwVWZPei9uV0FmT2NrdFZTY3BzckhicXFucS95eVNzCkNlRVk3SURj
-eDZtM1RXdkMxQm82R0EwVTNZOHBIc3RDak8zQlVzS1pqTFUKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIGNzTDllYmxtc2JDcWROd0RFb1E3eG82dWZzc1Z3VXduU1p4c0dj
-eEhISGcKN21SWmZOM3cvSGRYTmo4Uit4anBGSmdkN1h1RktQcVlWRkZkNFhMWDg3
-WQotPiBzc2gtZWQyNTUxOSBTcENqQlEgdUMxN1FDUjhRQVBwblVVeXBHMlNnMTli
-WmZYSmpOeUhKUVUrd2MrV095dwpIckZ2c2dJSnlEWEY5K2xsWVFWQ2diL3psK3pG
-RWNOOEVENUVwZTRUb084Ci0+IHNzaC1lZDI1NTE5IEJZS0crdyBoRUZXMWR1czVV
-SkY0cEozRENmK1ZFUUZhcHNNamp1bHNEaThrRFovbWpJCk9HUEYxaVBlL2xmNkVj
-ZWIzVFpsdnQ0ejdMaVlQdmhDdi9OR3VRZlNLeWcKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRICsyQ2E4cjNwTG9na1A5SkhhaWEyMFR1aGR4Y2drZEZmVTFBZ2RvYVpxaTgK
-bFYwdW4xMTB4VTdnS0NNbmRwU0Zlc29GSG05RHBTS3VBMnBtTTZnb1JaNAotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgdGVaL2hBTGhGQUxRdTUyZTlKaFFCRHNEZzg0UWE2
-cU5lZURNZE9CcURRTQpHeGhuSytwWUtLMStHNWUzM21Ud1l4RFRVeGM3YWwxNEhX
-dEVvSDhta1FrCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBDN0Q0Yll6M285Y1N2aVRR
-NGJIWVlwalFMclNtZG8zMUEvRHNqTGEvM1JZCkY2T0FlQzFRRUZjUG5pdGJEME9E
-d3N3NkJ0cjNEVk56OEV0UEYxaTJvaG8KLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFhG
-WDFDWGU2WDVKRVdXMUw3Q2Izd00vVjRzdUdZVVI2OW82N2JJaUNzaEkKMkRDOVJP
-Mkh4WjVpUGNKVWZwU0ZTaTRnTVZTbVA0MHZ3MVBNTStGU2QwdwotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgVHc4YVF6WGt3YUFPK1RYdHZXb2pWM3hxQnJuQzlNdFlTYmQ4
-YXBJZlRnTQovL3JWTUpKQUU2anl0ZllxL2Njelh4RFVmWUNhWk9DamhEVmg3SVIr
-R3MwCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBsVGdwd0VEN2pqQUw0K1pQTm1CeHhz
-aUFvdGxoOStBSWpFclBnOHZoY1hjCkZMNW41TmVaVDFHWHo2SWw0L2xJZWwxSmV5
-S1licTVrVXVyT3VIbU9LU0EKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIGxldGpyelBP
-d25pM0tGQWZMSnFOTWtLSUVhQ2F5aGg0TjJObVpVYlBwUU0KZVdBWU9VYTZzN0xk
-Vk9GTTFZYWNXZjEyWno4K3RIT0VxeWpzUTJjUjVCZwotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgd0QvT05pMXpFUWNHbmVMd2ZTVnlzcnhiWTAzZWhETitzdENlNGE3RkpV
-bwpyOUd1em1EaitqcllXV25IMFE0aTlEeGU4RGNCdnlQYXBaK1BDVmtDR09NCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBuYndHSDRtWTZlMUh2L3VSUFJMRXJxYk9VOStk
-U05GV21PTXh5VjIzd2tVClV1N0RBdTRBNFZTUUlSbWpFVDNza2ovU3ZuZU9CY0RQ
-d09LL3RhRmdOWmcKLT4gfT5mLWdyZWFzZSB3alNnClRiSUZrU0NvVGx2dHlGSFBw
-YXNMTEZmNW9Wd0JjSUpkSEwrbXhleFZiMHl2UUpnZDFiQmU0U0JlV1R5cFpuZDIK
-VXlSQkJhcGo0elJ6d3QvOVVUaW1aa3lvQ1IzRVZVY3VqRlRVeGRRR1BwT1ZLdmsw
-SDd1UDhZUkMKLS0tIGd1V244TTFSMmUyNFAyY2hFbW1HUWZPZUZocjRkeHpHSmwx
-Mi9pazM3RXMKxrQCVrV1nM4A6qr3QoMt2hamB0xMLgeAW+TAR05/zyXwEvZtWi60
-RuoRRz6dojKNedQY+Mxct/nHNc+UsVSciZgKHNs/1lRzSTtdCsZNiJ0y/ZPaFDVG
-5fqMuQldtX2an/EWuMOcTBpJVSzl4xYWSu5rra6NTIpOb2ky0tkDRkvZX98Inu4J
-K8QimSEmz/tlRbTL9NV4O4mjyKVUrTdsHdbL6tdyero72RstMLGaAZc3e11QhF8w
-q5zNGGLiGtBrRQ9cTJJ4gZMaCi0JXkGUJgfWSv67Qpy14BaEy+fDylaK4Z/r5gKo
-qb5g6gCp6F8DdpnDbpEDfL1Yk8WnIKDAwa/2ZDJ5aUWJUUQ6FKw31NMwr5poj7WO
-NJ4lf/etZVxXhvhGs0ycSG/vQoVymy9XWPWCsqwnO0h7VF3UyHfb2kEK1HJIsz1Q
-patift/a/0Sp2EgmiVe1UKF13tTP3r0pq3LVjII0Z7EF5XMKvDS13e5YUPuXM4P0
-neqnEqkaSrodOf4dOPhUWNTEeYJRMW/gr0/d7+MtZrMNj3OjcZRHjZf76Ag=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBVUy9q
+SDc5SjNYT3djMmVnbmZrSkpDQlQ5VmJQZlFzaUhJS1hja3R0bEV3CnMvK2NKd05q
+OUltdUUzWlFUZkhMa3c1UkdaVm1aQlk3MmtGalFsV1dRWkEKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIEh1VWxrNnZoN0tabE85NTJuUFVmTGw0c09IVWI1Q3Ird3BWb0p1
+ZSt4eVEKWWlFMzc2SzVwRE5CNVk1N3haRW9UTGpMdjk2d2cxa3BQOUFrSTk1MmtW
+OAotPiBzc2gtZWQyNTUxOSBTcENqQlEgVHRUTnhwckpoVEFpMUxWbk1yekRDTzA1
+WWZvSXpDZWxEaCtDVHNKVENpMApncXZIY3ZFbHJxY3VkTGVsclBTQ09jaWxRdDdO
+VEsxdmFKYWNEdkUvT29FCi0+IHNzaC1lZDI1NTE5IEJZS0crdyA2ZUhRa3o1V20r
+a2tQNmQrYk9wemFhNytRY3FuOTFmMmRad0FNNXExWEQwCmp1RjFDS0xwSGtHQUUy
+RDlWVVdxWjhvRGVEeHo4TEdzT1JSRmIxcDgrZU0KLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIDZYYXVwaWdrTTBKYlZhQk9STGNPV3ZqeW5yZDVpcFUxSTVsNW9JcXF6eTAK
+VEk2Skk3bFdtWEhoaDllYjloQkcyT2tUaTFtdHYvcFQyalpuaTFac29FWQotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgS1I0NWdPY3ZSU2xENDFFeEVtNVU4dkdGRVVkUWYw
+bjhYWlNXMm9jU0UwdwpPQU5KMTVuODVhUzFxWnIzclhCU05mMnU0R3FtanVxK0xn
+VFFJSTFvWHA0Ci0+IHNzaC1lZDI1NTE5IFJvWDVQUSBhSStkek51ZWQ4a1dVaG9w
+TFN3Vm5oMUwraUx3MFR4bXVnenpPNE0xVmdjCjhORitCVU9nRWpQNERDMElBZk94
+a09LMHFhM2V1dDZvamltUnY4TENqYnMKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIHVP
+SCtCUWc1N3E5Zzd3aHllS0owQ2d3anhSYnRFOWh4SlgyOG5ZWFlJbEkKNHVzMjZD
+T3QvYXZPaTU1SDNCTnNFNlRtRFpSZy9wQ1F6WkNxNUg2bCtDVQotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgYVdKNk41MGxMMXl6SkNWVmdsREhTeFJ6RTJzdkxTcWhtY3NT
+bXYzTnRnZwpnaXBHKzNYYzNDd0ErbDhBNEVOZ1FWcFJZT09TY3FBanZIRU9nTldu
+L293Ci0+IHNzaC1lZDI1NTE5IDVhZHFNZyBWSUFiQjBLVjVjdUdIdUR2b1Q3LzJJ
+c01VMS8yZWJxQkN5bXVuNjhXUkFzClpuT2k5aFFWQjNsNjlNSHc0Q2xZWFdDeGxY
+V2ZBNDNYN3lsZlFrTUkvNmMKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIDBrYkk1akZE
+NFc0UUsrV1RlbW02NU9ZTlcyRGRMUGVmOWtwOW9VaXY4U1UKeklYZUdtci8xYzg5
+Rnc0V1M4QktScUVwSG1JcnprT2pMdDJWYVJmVTdDcwotPiBzc2gtZWQyNTUxOSBw
+ZUZCUWcgQzdTcmtaZER3Zk40OVFpRU9pTDhqTHBFWTA4SS9NY0g1RE10ejJtdjlU
+RQptZ3FQMmNnYzBEc3BpUDdNYTg4U3U1SFhDb05KdnIzV0VzT3pXT1psOVE0Ci0+
+IHNzaC1lZDI1NTE5IDl2LzJIQSBzRko3NGlWUmpDb1U0WXpKN0lraDYzTWlIYTFj
+OStWa2NzMEQvNzN0UlFRCk1LeUZSVFdPa3NpY2M1eUIxRHhqV1BFNlpjN2Ntb2Rq
+dkFveVdxRFpod2MKLT4gc3NoLWVkMjU1MTkga0hrMmdBIEEzOTVLTzg3d0ZYaTgz
+TXdJYkZlcVVqQm5KaXVDaEZlbWw5OU1jNkw0eFEKVjZra3dac0NUQ2pBZnRFMGND
+Qm8wbkdVQytxQnpGSzNjSjJtVTk2dEhSSQotPiBzc2gtZWQyNTUxOSBJb3NBQlEg
+UVpVWHV2OWdWYnhydTJZODRzVEdWQVhFODFQWFVVSWw5NWJocXduY2hDMApnUDNM
+UXkxL2NTQWVVeUdkeHdHbnE4cFJXMExLK0IxWUxlQlBFVlllOWVZCi0+ICozLWdy
+ZWFzZSBgS1gtOiBuK18KbThIa1FGM25sc0o1UU1yWlFoY20vNS9oRGdpQmQxWXBr
+cnVwaHd1cDgwdGpGQkQrREs4dwotLS0gUHRYWjF4OUV4NVhESlo3LytqdzVOTHNU
+Z1ROdmJ4SHkyZGhzQlJXeWw4MApz+OC1nGrL+AgkWWYC3bYmEZ4WE7wUiBGSQjuu
+MFlv1EBOveOzJ9eKKdR+zOl0Zo+pL6TrUUju6iaIvPd16x8NBiiDGmiAkpM9qcQv
+CG/KFcP5kq5Ddx9rGqvOTn8YTk7Se10BmBEduERWtSuv6yEngrAJzF1QaeBM2PXH
++TxPlblCbiE3g9Dk6c+0S74izVAz+1cD8Lwx7n/7DX6gHtIoSMIDi38mfy9baZdl
+Zcaw8Nr/wgBT61U2ywXGc9h50Jec1zUXfBEdLZQCFNpnZjntxh+obvdM43HJzRkz
+sF9UXXWrvQrP21xxxa1wYy2UNANAHqMegUVNIZZfncF0lnA38sJDX8nsYKaIsnce
+CnacNDrf2gpZkk6Ml5Pjcc85B1dE3DOrogg/Dq84c+JtN9r5N3mrzBHeg4xc8dOX
+GGq1+9a4w/w2CvvoRbFXxSxo7a/B73oeNggsHCcZ+o2CG/eR1mDNznU6XSW/1dMg
+FnEBJB4vAG/fejLMHHWNb4bfa89Oba7wN2oHKm41cf+JWHJ0/Thn1k6DzcWRoHtc
+kJS1Zr8mQw==
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/obsidian_sync_env.age b/common/secrets/secrets/obsidian_sync_env.age
index 50b1152..b35ab57 100644
--- a/common/secrets/secrets/obsidian_sync_env.age
+++ b/common/secrets/secrets/obsidian_sync_env.age
@@ -1,38 +1,43 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBFSG9R
-akdvQzNiRjgzc1pIZ09zdGIvUld1RmdHRUxnT3o3L3F2UlVxZlZNCmhpZUhWUHFO
-cXFhcjgzb3VJM24ySDNQNkZLOEFWTkMrK0QyYkV0YlZDY3MKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIG5CMlNyTjhCZDI5cHBYOE1nNGtMc3g1bzlJT0JNc0l1TVNzK0p2
-ZHhJVDAKRUFieUlUdmhTVWtaUGpJa0cxamorMmZDRDV3ZGtRU0pvVzJxL29oRzJK
-NAotPiBzc2gtZWQyNTUxOSBTcENqQlEgc1JLOTF6ZFUxaXpmWGlLYWFEdzAydDYv
-aW9NZjZEVENnVzYzUU14UHhSYwpQQ055RkVUTThWekwvMFlSWjhjUWx4Qmlrdm9M
-M0RibjZTVnFlN1doN0RnCi0+IHNzaC1lZDI1NTE5IEJZS0crdyB5cTI4UnRVK01M
-TU80WC80TFNGTW10TmdVbXJGeVAyS25oL0pkWVNGRkZjCjUrcUc2bjkxY3lXd2Ix
-YUhFSk4raXcvcFBnT0dKeVVaK1E2MTBFd3dxbGMKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIHRsWEZBVE5TUkYwNHZFOStPNVFac0pCWnN2aDJPMVI1bVFXMW9JbjFzR0UK
-djFneHk0OS9rYVlpd1FDNWFUakViOVhsQjhoZTdoTXI1RXUxRVQ1OTBxYwotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgcU5mUTYyUG1Ob0dkN1FkRDZBMFI2QXRoZlNhbXc5
-N01TL3hSbFY5b1MzbwpBN3R5NG9LM0ZOS0hHZkppbXRyam5zYnRUMXB3YjduOU5p
-ZmMxOUxXMnBnCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBKMHNyeHI3ODhOQzNPQ2xG
-QnQwUFM1cGt4QjdPTkF5TSsvajNqRkx1VmhJCngxWFk4S1R0OXFYV1loU2kyRWVa
-UjBrN05McmhtcW9wOU4wY3pxcmlKZVkKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFFT
-YkRlM0EvYVhWbmVqQjFhQU5Zak42MjI1cTU1dE8zR1p2bmFkRmYzRFkKSGc3elpl
-NVBKMlZYalF4VTYwV3VLaGxramJ3ZlVwOXdud3hCd1BTS2JPUQotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgSFg1Q2xJR1dNY0xmYUhaY3psUkE5TG4vOXU3Znhac1ZmVFdn
-L0JQdUtSdwptMDd1TmpPSnB0TENqOHBVM0p6a2l6NlBQRFRtZ3V5YnY2eVhsNlBu
-c0ljCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyA4WWNXT1VPZy9leFVrK0o2ZThHZTEr
-bUNwKytnc3ZiM0t2NGJPNFdRZWowCk81QzN5ODYyT3hNVkVWMEtYbTlQclpwMkl3
-SjBZZ09FYVMvNG0rV1BKamMKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIGw4UitKVU44
-S1BjSzFYUlNPMDEraFM4cGxhTk9KYlZJVnIxdmJZSlluQTQKR21yN2hyVlM1L3hB
-V012dUUrQjVIeXBWbUZ1QzZNYVFYSm5PeGs5dVR3WQotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgeEhjL2F5RllRVlZ1UElxL0w3MmlmQXc3TlBaUEt0cTU4VThUbHVWVlhD
-SQpncStaK2lDeE9FMVpYVmZzVmlkOWdxQUs0MVA3YU5ZSEorVXFwMndwdkpvCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBwUHhzTUE2WFo5anYzTlFuM1FkdHh3T2ZOT2V5
-V3lxZDhMMEVWVkwxN0hVClNxa3hEczJmSUJpYS94bzg5Nnk3NUtWSXQ3SEdLQkJG
-b3hFbmN1VjhWUG8KLT4gUUktZ3JlYXNlIF0gbkpjKWlEIDRmTEBrIkg8CmxURW80
-dmRhZ1UvSkhzd1lqOVZTTlpxYnNQbDllUFUKLS0tIGN5SzhpY3VFM3NBUzlFK3gx
-dFhmN0dscWE5REVQMTVZa3NzRXFrZVhOU0kKUdr7OyUzs5iQwWX7rDucmC1sbRfe
-AulfGi+K/ajK0R39JnJVE/WERNANzanPLOwk/7pI69HPQm/irA5HaX/JK6q5bxP5
-mgdhR+5KF6uk7QXjU+w5uKN+ypVzZX29kO6p3cw8hOODtebUvP10QK7jYURxlo6g
-o4Q=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBsTGRH
+YXJwM1JGbFY1c1dtV28xSlBYTWdObkJRUmdRVTROcm1hNlh4ZWlzClVEemdrc3ov
+NzVqVFk0RjV2eVBCaVF6WUcrVWh2MWxpSjhyUWZsT0Y2ZVUKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIGFYWUZqRnhMdjVZQ3BsTXcxcXNaeWQ4YUZMRytSbm0xYXJpeXd1
+MWlNMlUKb3ZCOVdJRGF6V2xaOGUvKzV6N1FvYkJkVlo4VlZPeE9BYk9xYk9qbEF0
+dwotPiBzc2gtZWQyNTUxOSBTcENqQlEgTGFZbytBdXJjYWdRdHlrVE5vbGs5UzJp
+dUkxUzk5QmlZR2lvQi9UYVpYNAozK1JwREZQaWxtYzhzUit1eHFldGJXbHNGdktH
+SFFJcGJ3U21MQWx4M3FnCi0+IHNzaC1lZDI1NTE5IEJZS0crdyAxaTdFQ00xei9L
+TEdCd216MGRXbmRrTEdvTVJwdEVmUlFLVGsxOXlJOUQ4CkdobFNlSTdHaFVMUU12
+VUhUdzlDWVMrZ0VaeVlmZlliZkhmbWhCU1RlSTQKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIHFJU2JRWEJrL0ljZkVSamwreW1KOTgwWGFkZ3lGWnFXY2tMVmZKclF6R28K
+ZXlOOEdIanFUWEdGdys1R3RWNjNvWDY0RytSeXVmdEkyOWJuK09JNERKVQotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgYU1pWk51WmZZMjJnaUpQdjJxdjA4VCtVQzhtS0N1
+U1A1aUJRYkY2S1kzawo0c3Vzb2EzZWVLV3NOVWJZc0tOMXNrd3ZscnFkeXpCcWRj
+ZEZIWFFFSFQ0Ci0+IHNzaC1lZDI1NTE5IFJvWDVQUSByWG96bDI0Sys5bEZVYzNk
+RDg2eSt2d2Z1R25zVWsxWGhDTHBaNkJWdVNRCmRhK3M5Q3VZeVR0RkpGbVZmZHhz
+ZlVqbWNaVmVxbTRrejNQUFVwRDlYU1kKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIHE5
+blF5dTNhd1RIUTZTdCtIdXViaXN5VFg5Zy9paVdDT2ZhZktNTlpQaHcKM2cvQWJE
+aUh5OWRmRTh5dmgxc3dMMlZZRlBJcWlTVnpCTTZnSUIvSVhCTQotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgQWRJTVQ3ODN5NmllaXRzL0Y1NE1jZ1NZNmJXUFJSUU9qRGFn
+aTBKVzlETQptUHlNeDJxcW5qcWVxYVBpb3docHdjM0pyaXErTzdRMTFuQnJVZjhJ
+akc4Ci0+IHNzaC1lZDI1NTE5IDVhZHFNZyBMY1NDelF0NUlERjdFTWhwMGxJdnR3
+NzBQWG1tbHhEYmdwQWtYeHgyNVZ3CkNzR3JySUxPUXJTMVJ1R2ZRZHpkNjZLcEZU
+U2pWaTIyS0lyTloyeDdGKzQKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIE9QeWRVUXZE
+NDNFS1Fmck5mRWc2bVlDeHh1VW11K1BONU9KSit0dkZCbTgKMmo0VVcyR09oeVBC
+RkpyeFpOcVZUaitCL0pvclhmL2JLZE9nSFJYanJVOAotPiBzc2gtZWQyNTUxOSBw
+ZUZCUWcgY1gxbkNxTEtXV2F3WWQraXJFMGkwQWZBazNKVTdNZTI3VG10L0hkTzN4
+YwpJcDYvRUxwQnVzSEVEbWNtOGVicm1aVURoZDBxR214dTUyVjdudjBjamFJCi0+
+IHNzaC1lZDI1NTE5IDl2LzJIQSBKcUs5TTE2Mk45SmgrWTRpMXZVb2YycCtldTRD
+UWt5T0J2Q1NGRU5BVTJJCk5RYlFVMk1Jai9KYzhOQUtobGFnZlhaWmhQSGxFcmpY
+aG01aXFGQ09PdGcKLT4gc3NoLWVkMjU1MTkga0hrMmdBIENnbEo4UXZWRldwcDZq
+ank4aFlZa01KWTFURUo5ZXJ5aGMxcXNwTDM1R0kKcFJpN2QzcVdNcHJIbXIrMHF0
+Q1RROFV3NCt4RW1BVjVmVTV4U01OSW8zOAotPiBzc2gtZWQyNTUxOSBJb3NBQlEg
+SGtkdTUrTDd2ZU0zeTR3L3VLbWlqWElRUlQ5QmxCcmNMWm9qMk41aUEyMApKSHF5
+VlpjUXRTQWJ2bmRhOTZ3Wk5DbktiVmpwaS9EQ0hEckordTFwSUhRCi0+IDVwSS1n
+cmVhc2UgRVo1IEguX2EKa3p5cCt2WjYwWDB1TXNMeU9FTG1LRFQ1NTd6VlA3eDVU
+Vys4NFRJckdVcVdialVKV2hyUk5uK0J6SkJTYzZHdApaZlkKLS0tIDMxSmJtLzZD
+T0NQaWlEcVY0eTBFVVVKVUkwRnlNbDdnNEl4Qk5jY2FWNnMKUzvOMuRTZl8GtwWB
+GUg2RISUPDZ3kmzzN6gUe2NlJfzSE/dW3zYuSZQ8qFXPLp6JTsJlfNmPqV4KTwOu
+y0a1GymZ3/q29nOSIuAW9Dgi/t8yBpHnQn7hp1ptOM9KZBCrEqwY4j5q+uSwPQwY
+R+vqTRjL3UA/z0Q=
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/secrets.nix b/common/secrets/secrets/secrets.nix
index 018fedb..2233940 100644
--- a/common/secrets/secrets/secrets.nix
+++ b/common/secrets/secrets/secrets.nix
@@ -21,6 +21,8 @@ let
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICauUtSa71+oQAiLxp3GMMbmNXcbr9Mc7eK8b/lqZbbS josh@oren"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGTAz6n35c3r8kSuWJM1JzMVx6jK+0EBwpJA5eTIvy3N root@h001"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICRHer3NrJiklp4oDNRCzDxc9fXpXn5rPAXGFce8ugy2 luser@h001"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHsV5r9sWYgrr9t9p12Epzm6WtxN/XsKSCb46+ODQvVT root@h003"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILQLt2Hc+CN6+e7/sf3Fv0FQlp6+yrIbIJ/J9AdnJCjI luser@h003"
   ];
 in
 {
diff --git a/common/secrets/secrets/us_chi_wg.age b/common/secrets/secrets/us_chi_wg.age
index d8d73bb..94a440b 100644
--- a/common/secrets/secrets/us_chi_wg.age
+++ b/common/secrets/secrets/us_chi_wg.age
@@ -1,43 +1,46 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBSYmZY
-MnczRlgwWVU0TFNCNFRCbjViNkF3cGFaSGZVQ1JOTmQ0VmdzZVVJCmNyUndLTnZR
-Ky9vUU1uT2FHQVFlUjNCNURyVXNWWkEzTlNCblBuZ0J3L3cKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIHZRcVNYNE92QXpuaHpGa0QySEx5aGxNaUlZSXVOWXJzdEU2c09I
-WDE2bEkKaHJDWlVMdkxxUVZaekExczlrZDdDWE91b1pXaGQvdHZNV2pKZnhVOUNj
-SQotPiBzc2gtZWQyNTUxOSBTcENqQlEgdkFSSk1YWFIyME1vbitEaE1lcDZMeVRF
-aGE0a0xlMzNwMFQ5M1pzZU0zOApMb1k5M1dncHhjNW03T3VQUUFZWDFwTkpFYWd2
-bk12Z0Z5S2wzd2xpODZBCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBCa3ZLcjVzdmdq
-L3NjOUg3ZmhySUdnd1Z0MWNDMU1xV3FFSE9kNzFhOERzClJpTS9QbDBSY0Z1WTY3
-ckUyYVoyWHF3TGllNW1neU5Ga2ROT2xVc0pzaFUKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIFgyc3BwM0J1V1g4UFduQVNSN2hmUFRlWDhxSHJMaFFKeEFWM29yU2E1Qm8K
-L1ZWcU1pWHRFL09nSzB4VTZDbmYvdVJZV2tlQzROZlVsM2pKNUJTZFFoawotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgRll6cWlwdFRNbmtkM0JCNlRaWG53U1BhN3hVY0d1
-dUNPSWNTTmFDZVp5awpHdW5iY0t4RVdoVEFxd2xUUDF6cTZTTlBTbXp2R252S3Uz
-UU41MW94V0NZCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBvdlZpSEZQcWtucDBOZXdW
-WnN3NjAwY2IvODd1dWpyaXdFVWJDUWU2MXpNClYrbTVBR2Zzc0k4dEFMZHdadTlI
-d2JUUXltY0xxOHd1TUYyZlFMdndoR0EKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIEJa
-MnlGekdwNnV6MUhuMFN6YnBRQzVuVSs5RlFRUjFqZlVmdCtTaThORFEKZXBWcWMw
-anJSUWlWWjZBNmRocFBTZmxWWWxNQm44aVkyM2ZGdHQ2dVFTcwotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgb2V3NkJsSUoveVdaajlNZ2Q5clJuaTYvNWVBYUJPand5NEF0
-YlpsQUgxTQpRWXgxSEsva1hpVGU4Ym9SNlhmQ283S2RNZUtFdFdwdTdpdFh4TUgw
-L3hNCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyAyKzNIdWpCcTdmdzhMSHZwMG00NVBi
-YkMybGxZaWpEcnUzUEVHWnlSTWh3ClA3eEpObGpsTEZiSTIrQUNReEJRbklnYnNF
-Y2htdmlzdjc5LzdlOWxtYW8KLT4gc3NoLWVkMjU1MTkgWmUxTXdRIDAxWC9YaXpX
-ejE3dml5VDA2VTJHU2N0dmQxQTc1NXE5M3RxQ2loZ3kvd1EKVFFmQTV3ZTNXNkZx
-OTNIWEZGMWZlcG45bVhMMVVMUThTYVVaYTdSdDRzRQotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgRTM3UGtmZ2FNM0NMSExVQUQ4cFFGdnlMTUxtd0pNY0tRR3lCdHN0Q3p5
-dwpIVEZVWFprYUZIZDFpQ1JMTjVOY1gvMUxDVURCK2pLSTZ4NVcyc1VuT3J3Ci0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBublZiMzdYMzJYQ0wvYUJqS0poN3NXQWlTZE9h
-ZWg3bnloMlo3d2JSZVVJCm1QTG9zVExGamdsR0h4WVQ2VVFTRGR6Z056SUlZNG1W
-WUR4TDR0UUhQdzgKLT4gbWFPIi1ncmVhc2UgZHZEQDQgKHFpXFEzIDFvTkEKa3dl
-TE5VOFhhbnNhdXpYTnlJWXBKYUhPRHVFeUpBdTdDYTYzL29CcHZvTWxjVnh1QnBz
-WVFjWnhYZ1RYQ1FWLwpRMGpzNVEwa1hPeUNyd3dWM0RmNFh2SGtvUnFkWUxZCi0t
-LSBZcnpKS3E3UFpIMnVYcGRyU3pwNFhkU2JrbXVOTW5obDkxSXN6Z3o0d3c0CkHz
-fE5igtb73/1C1Yi2hAiPNs7GWJDsgF28LtaVateZ+/iBsmIDfpHEnTW3pa8/y2ac
-gWAyQeR4t6QW7AvUZYZCHjAh6xywLR+LMFfsXAFwkAQi5nS9icXN1+SCrJac/WWx
-6LtZv7BZ2H1VXgYR4kJqjeEhB52bwBYluMb3oMGC4e9zQyBpsTZm+xSVYtqbqql7
-hH0vK26r6Sy7rLXWCYtiMXnad6ua+gUVua/CyfvdOVasJpjlQgtP+GY/Oag7mvAh
-j11nr8MMCaYAaJ5oKMl95c9KVFEZDVnA9OvbeidXwM4RoRhZl98zyaHyJvUP3fCQ
-eYzLYgz8MKvlKNCgXqeH/RxMga21py/agOFTkn4mtsycfTBkH72Qkdqv8m2UzoiS
-vB32d4N9PzeDT+GNsICpE9sBUTg5p6IxOmusX99hr3JnlQ==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBFazhx
+VVN3VXgrWXdWZzNwOHdIVzZSSTlRa2lEYjhXRzlCWXZhMmQ2QXdzCms5MmpGZ0hW
+c3JYM25mNWliNHlxNG14ZHppcWU3QmhxVHVwS0QwaWNaN0kKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIE5Cd0M1S0ZCWTVXZ2lLR3NzV2lTb3dubHRyQmlsMDF2TFZLM1B2
+bnBMaGMKSE9ad3BrSEF1T0g2bkN5SjAxOEdjSytIWGxSN0t4ZDlQSkpVRzE5ellm
+QQotPiBzc2gtZWQyNTUxOSBTcENqQlEgYllQVWlYUnZ2cjJ5N0t2WFJWMG5ReG03
+V3pkSzFEK2syRzd5R0NyVFdEdwpNODJLenpIZVByL0hPSEFFbG1FVnBpeU1relhl
+R1dpamwwV1JoWG9CNmprCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBFTSt3Z2UrQStY
+Vk5LeXFETkdmeXdGSVcwTlA4bzJKK2poZFNUL1Qvb1NFClpIUHVWV3Q0RTViRzBI
+aG5QTTZCazUralExS0NRUWF0cVNZTlZIaC9mQ0kKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIDF4Z1RmZkJrblIrQ1NqU0hDNWpPYS9sUUJJTWFQOGNJejduTkdLbFBJQ2MK
+b3hXd09EaGNPaUQ5ZnIyNHlpK2hSWm5WV0lERm5xcWQxa3hGaDVTRzFYVQotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgY09RbXM3WmlDMVVRMTdKRjN6aktFY20zNjJmMFBY
+ajQ1VjRwQXVqRkN6WQpiaDdRNmtBUy8xMksyQld5bTMzTXlMVnhQQzU2a1RQdE5z
+dGhpWWxXRThNCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBTQzhUY01rOFlCV1ZQbGhJ
+dGFTK00wZnNyRGVYNjQ5T3dtZENDSHpycUdzCjNZNVd5dWkrWG9lMWdhZVJQUE4w
+SHl4dmpwU25PSDZWVkZUTjZtWmNhSjgKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIEFH
+WmNFL1ZYazFZNVB0R1JYTFpBNk50U0VWazBhOGh2SDhHdGlwRWdSeHMKemUwNXN0
+aEdMdGJVZmdpWFN2Zm1BT2wrQzFBR0hIUi85ZHFSSVd3NklXMAotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgejVkVURQd3hrQ2pyMU9MVG9VTG9VZmtKbmtDZHU0RjdHM2lz
+c2VTTy9FYwpUZTBkaU1rQmsxaWRzTjhvdis2VUZJV09Vb3g2VTNNVHN0Z1llazRL
+U0VBCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBrRXNWcHk2akc1bVZBbitQcUlLYU5B
+cmRnSWM2dkVKU1p3dk1ueUo0bUc0CmEzdjF0dUgrOXhETWRDaGlDQU4zTWxXNXBS
+TUs4V3U5VWNNczNTVDNLb00KLT4gc3NoLWVkMjU1MTkgWmUxTXdRIERULzFFSERl
+b2ZNa2tzSDhZbDVJb0RndDFBRzlBc2dxcWJMcmcrMFJUaDQKY25kejI4VDVrYkUx
+OWo2M0hLRFBLNi9HeXc1elVVTTY5Q094RFUxQUlTUQotPiBzc2gtZWQyNTUxOSBw
+ZUZCUWcgTlpTeVFPOUFMc0hNNkZJZGxJSVltS0JEVnFoRWNBWGpLUVNwR1pPZXlT
+YwpUTjJPak8xTWtlUEdFNDZhMVBxWE5xMGZlUFFmQlpkWkh5UDdqeW1SeHlRCi0+
+IHNzaC1lZDI1NTE5IDl2LzJIQSBZVWtxQWNwcDdxMUdtSVNzT3hkNjMvVXUzd1Vp
+bXp2YTVOOGFyMDJPV0dzClhkZXNpbGVLUGV4SE5CSDIzYTNRRkg0ZXh0MEdDNnhz
+aEtReUJES3ZsbWsKLT4gc3NoLWVkMjU1MTkga0hrMmdBIE1iRkpLbzJnZFVObkNQ
+SzI5K3krcjJvMDNhRXduWFhXd2RWUDBTdWpVaHMKMnFlRGFsSnlTMStZbnhYeG5U
+Yng1TXZOTSswc1FXY00wSTErUzNDTzhvawotPiBzc2gtZWQyNTUxOSBJb3NBQlEg
+QVFhZlJhRjNsdndHa0RPaVJoYUMrNTRoY29iUWNXdXJvS0hBb3VMU0oydwp0dmdo
+amFxNGJnanRCREt3ZFhld0M4UFk1WmM2RmJmVTY4b0g0RkJXYnJVCi0+IGgnMTZv
+d2dGLWdyZWFzZSBQMkEKbThTYkxNa3YwK2xXbUhxb2RqQnd6UUl6a0JVcnVPR050
+ZFZCNmpjCi0tLSA0QVdjZEIrOWhUaVpHNytqY0h3eExLVWc0djlDRWtQVEZuWHM5
+YlVydnljCo/0r5CGdm/VW7wxgZhkhisHJbstH3r3YrghiSORsBwxX+GaKIziS1ns
+MyRg6TWoWjIUe4epfGzqton35ekvrXWxGlLCuIkQgY1frgPTE4kZdm/T1pqzZpQ0
+4vZkl7nVd4k9oayv2LfpN8loG8npcwLfSKeVFCEooTOs+M3eH+wCEUd4r+TjfG3D
+ZT2eAX9HethENX4GQxN+RQagyWOlnZVpf6QYnwg/bzRGtRSDLVYqmLJd5BbOrON7
+XN65I5DX2kBGtB3Y3F15hHjGxHFyded4bO9w/SF+jOM+yGnTnTQ1G7FSw0T8dwWo
+7laPDx5WSM1zop0jLJ5iyZjNWJJt/j8t9FBGdqxtPUxP4jPVTTEiYJbtTauZtRUN
+rc3UbQvDJTArGbwAQsTlYuMd59oIy2+cgpYHyhW2cPixL/VHxRYupNWj8g==
 -----END AGE ENCRYPTED FILE-----
diff --git a/hosts/h003/configuration.nix b/hosts/h003/configuration.nix
index d00387c..eb65bdf 100644
--- a/hosts/h003/configuration.nix
+++ b/hosts/h003/configuration.nix
@@ -1,8 +1,6 @@
 {
-  pkgs,
-  config,
   ...
 }:
 {
-
+  system.stateVersion = "25.05"; # Did you read the comment?
 }
diff --git a/hosts/h003/hardware-configuration.nix b/hosts/h003/hardware-configuration.nix
index ceaa644..2e228cd 100644
--- a/hosts/h003/hardware-configuration.nix
+++ b/hosts/h003/hardware-configuration.nix
@@ -4,6 +4,7 @@
 {
   config,
   lib,
+  pkgs,
   modulesPath,
   ...
 }:
@@ -14,33 +15,69 @@
   ];
 
   boot.initrd.availableKernelModules = [
-    "ehci_pci"
-    "ahci"
+    "nvme"
     "xhci_pci"
-    "firewire_ohci"
-    "usb_storage"
     "usbhid"
+    "usb_storage"
     "sd_mod"
-    "sr_mod"
   ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/NIXROOT";
-    fsType = "ext4";
-  };
-
   fileSystems."/boot" = {
     device = "/dev/disk/by-label/NIXBOOT";
     fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
+
+  boot.initrd.secrets = {
+    "/keyfile_nvme0n1p1" = "/boot/keyfile_nvme0n1p1";
+  };
+
+  boot.initrd.luks.devices."cryptroot" = {
+    device = "/dev/disk/by-label/NIXROOT";
+    keyFile = "/keyfile_nvme0n1p1";
+    allowDiscards = true; # Allows SSD TRIM to manage wear on SSD
+  };
+
+  fileSystems."/" = {
+    device = "/dev/mapper/cryptroot";
+    fsType = "btrfs";
+    options = [
+      "subvol=root"
+      "compress=zstd"
+      "noatime"
+    ];
+  };
+
+  fileSystems."/nix" = {
+    device = "/dev/mapper/cryptroot";
+    fsType = "btrfs";
+    options = [
+      "subvol=nix"
+      "compress=zstd"
+      "noatime"
+    ];
+  };
+
+  fileSystems."/.snapshots" = {
+    device = "/dev/mapper/cryptroot";
+    fsType = "btrfs";
+    options = [
+      "subvol=snapshots"
+      "compress=zstd"
+      "noatime"
+    ];
   };
 
   swapDevices = [
     {
       device = "/.swapfile";
-      size = 18 * 1024; # 18GB
+      size = 32 * 1024; # 32 GiB
     }
   ];
 
@@ -49,8 +86,10 @@
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/onboard.sh b/onboard.sh
index 4a8b6df..fbfe769 100644
--- a/onboard.sh
+++ b/onboard.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# curl --proto '=https' --tlsv1.2 -sSf https://git.joshuabell.xyz/ringofstorms/dotfiles/raw/branch/master/onboard.sh
+# curl -O --proto '=https' --tlsv1.2 -sSf https://git.joshuabell.xyz/ringofstorms/dotfiles/raw/branch/master/onboard.sh
 
 # Go to nix configuration
 cd /mnt/etc/nixos
diff --git a/readme.md b/readme.md
index 96cac92..336e8de 100644
--- a/readme.md
+++ b/readme.md
@@ -33,52 +33,59 @@
     - Create passphrase and save to bitwarden
   - `cryptsetup luksOpen /dev/DEVUCE_1 cryptroot`
   - Create keyfile for auto-unlock (optional)
-    - `dd if=/dev/random of=/tmp/keyfile bs=1024 count=4`
+    - `dd if=/dev/random of=/tmp/keyfile_DEVICE_1 bs=1024 count=4`
     - `chmod 400 /tmp/keyfile`
-    - `cryptsetup luksAddKey /dev/DEVICE_1 /tmp/keyfile`
+    - `cryptsetup luksAddKey /dev/DEVICE_1 /tmp/keyfile_DEVICE_1`
 - Formatting
   - `mkfs.btrfs -L NIXROOT /dev/mapper/cryptroot`
   - `mkfs.fat -F 32 -n NIXBOOT /dev/DEVICE_2`
-- Create btrfs subvolumes (for better snapshot performance) (this is optional and can technically be skipped and put everything in one but I like this setup for cleanliness)
+- Create btrfs subvolumes (optional: for better snapshot perf)
   - `mount /dev/mapper/cryptroot /mnt`
   - `btrfs subvolume create /mnt/root`
   - `btrfs subvolume create /mnt/nix`
   - `btrfs subvolume create /mnt/snapshots`
   - `umount /mnt`
-- Mount
+- Mount (with sub vols above)
   - `mount -o subvol=root,compress=zstd,noatime /dev/mapper/cryptroot /mnt`
   - `mkdir -p /mnt/{nix,boot,.snapshots}`
   - `mount -o subvol=nix,compress=zstd,noatime /dev/mapper/cryptroot /mnt/nix`
   - `mount -o subvol=snapshots,compress=zstd,noatime /dev/mapper/cryptroot /mnt/.snapshots`
   - `mount -o umask=077 /dev/disk/by-label/NIXBOOT /mnt/boot`
-- Copy keyfile for auto-unlock (optional)
-  - `cp /tmp/keyfile /mnt/boot/keyfile`
-  - `chmod 400 /mnt/boot/keyfile`
-
-2. same as below...
-
-1. Install nix minimal:
-
-- Partitions
-  - `parted /dev/DEVICE -- mklabel gpt` - make GPT partition table
-  - `parted /dev/DEVICE -- mkpart NIXROOT ext4 2GB 100%` - make root partition (2GB offset for boot)
-  - `parted /dev/DEVICE -- mkpart ESP fat32 1MB 2GB` - make boot partition (2GB)
-  - `parted /dev/DEVICE -- set 2 esp on` - make boot bootable
-- Formatting
-  - `mkfs.ext4 -L NIXROOT /dev/DEVICE_1` - root ext4
-  - `mkfs.fat -F 32 -n NIXBOOT /dev/DEVICE_2` - boot FAT
-- Mount
-  - `mount /dev/disk/by-label/NIXROOT /mnt`
+- Mount (with no sub vols)
+  - `mount -o compress=zstd,noatime /dev/mapper/cryptroot /mnt`
   - `mkdir -p /mnt/boot`
   - `mount -o umask=077 /dev/disk/by-label/NIXBOOT /mnt/boot`
-(Note that swap files is defined in nix config later not needed at this stage)
+- Add SWAP device (optional)
+  - in hardware config
+```nix
+swapDevices = [
+  {
+    device = "/.swapfile";
+    size = 32 * 1024; # 32GB
+  }
+];
+```
+- Copy keyfile for auto-unlock (optional)
+  - `cp /tmp/keyfile_DEVICE_1 /mnt/boot/keyfile_DEVICE_1`
+  - `chmod 400 /mnt/boot/keyfile_DEVICE_1`
+- If Encrypted keyfile exists
+  - Add to hardware config
+```nix
+boot.initrd.secrets = {
+  "/keyfile_DEVICE_1" = "/boot/keyfile_DEVICE_1";
+};
+
+boot.initrd.luks.devices
+```
+
+2. Install and setup nixos
 
 - nixos config and hardware config
   - `export HOSTNAME=desired_hostname_for_this_machine`
   - `export USERNAME=desired_username_for_admin_on_this_machine` (josh)
   - `nixos-generate-config --root /mnt`
   - `cd /mnt/etc/nixos`
-  - `curl --proto '=https' --tlsv1.2 -sSf https://share.joshuabell.link/nix/onboard.sh`
+  - `curl -O --proto '=https' --tlsv1.2 -sSf https://git.joshuabell.xyz/ringofstorms/dotfiles/raw/branch/master/onboard.sh`
   - `chmod +x onboard.sh && ./onboard.sh`
   - verify hardware config, run `nixos-install`
   - `reboot`
@@ -88,8 +95,8 @@
 
 - `cat /etc/ssh/ssh_host_ed25519_key.pub ~/.ssh/id_ed25519.pub`
   - On an already onboarded computer copy these and add them to secrets/secrets.nix file
-  - Rekey secrets: `nix run github:yaxitech/ragenix -- --rules ~/.config/nixos-config/common/secrets/secrets/secrets.nix -r`
-  - Maybe copy hardware/configs over and setup, otehrwise do it on the client machine
+    - `nix run github:yaxitech/ragenix -- --rules ~/.config/nixos-config/common/secrets/secrets/secrets.nix -r`
+  - Maybe copy hardware/configs over and setup, otherwise do it on the client machine
 - git clone nixos-config `git clone https://git.joshuabell.xyz/ringofstorms/dotfiles ~/.config/nixos-config`
 - Setup config as needed
   - top level flake.nix additions
@@ -133,23 +140,27 @@ efi   /EFI/Microsoft/Boot/bootmgfw.efi
     Remove manual `deploy_linode`/`deploy_oracle` scripts. Use `deploy-rs` to apply updates across one or all hosts, including remote builds.
 - [ ] **Add `isoImage` outputs for every host for instant USB/boot media creation.**  
     Use:  
+
     ```
     packages.x86_64-linux.install-iso = nixosConfigurations.<host>.config.system.build.isoImage;
     ```
+
     Then:  
+
     ```
     nix build .#packages.x86_64-linux.install-iso
     ```
+
 - [ ] **Document or automate new host bootstrap:**  
-    - Script or steps: boot custom ISO, git clone config, secrets onboarding (agenix), nixos-install with flake config.
-    - Provide an example shell script or README note for a single-command initial setup.
+  - Script or steps: boot custom ISO, git clone config, secrets onboarding (agenix), nixos-install with flake config.
+  - Provide an example shell script or README note for a single-command initial setup.
 - [ ] **(Optional) Add an ephemeral “vm-experiment” target for NixOS VM/dev testing.**  
-    - Use new host config with minimal stateful services, then  
+  - Use new host config with minimal stateful services, then  
       `nixos-rebuild build-vm --flake .#vm-experiment`
 - [ ] **Remote build reliability:**  
-    - Parametrize/automate remote builder enable/disable.
-    - Add quickstart SSH builder key setup instructions per-host in README.
-    - (Optional) Use deploy-rs's agent forwarding and improve errors if builder can't be reached at deploy time.
+  - Parametrize/automate remote builder enable/disable.
+  - Add quickstart SSH builder key setup instructions per-host in README.
+  - (Optional) Use deploy-rs's agent forwarding and improve errors if builder can't be reached at deploy time.
 - [ ] **Add [disko](https://github.com/nix-community/disko) to declaratively manage disk/partition creation for new installs and reinstalls.**
 
 - work on secrets pre ragenix, stormd pre install for all the above bootstrapping steps would be ideal