diff --git a/flake.lock b/flake.lock
index ee75e63..c241d7b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -520,11 +520,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1712353617,
-        "narHash": "sha256-9KtWUwlKA7g/PERi3eYMgh+Ok+Y9QxE6WSOblpyKYcs=",
+        "lastModified": 1712821552,
+        "narHash": "sha256-melgbdpDZMKbM39b5X6vhz7PQ+yK591EWJIvnwTxQNM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f4089f8b1d676762db7acbb3e790ccee6d0c9da5",
+        "rev": "6271b14d3982aca7a4c8cd9683762b67e3a87349",
         "type": "github"
       },
       "original": {
@@ -536,11 +536,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1712163089,
-        "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
+        "lastModified": 1712608508,
+        "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
+        "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
         "type": "github"
       },
       "original": {
@@ -584,11 +584,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1712168706,
-        "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=",
+        "lastModified": 1712588820,
+        "narHash": "sha256-y31s5idk3jMJMAVE4Ud9AdI7HT3CgTAeMTJ0StqKN7Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb",
+        "rev": "d272ca50d1f7424fbfcd1e6f1c9e01d92f6da167",
         "type": "github"
       },
       "original": {
diff --git a/hosts/frikandel/email.nix b/hosts/frikandel/email.nix
index 39c75ee..480a8c1 100644
--- a/hosts/frikandel/email.nix
+++ b/hosts/frikandel/email.nix
@@ -252,4 +252,25 @@ in {
   };
 
   systemd.services.rspamd.serviceConfig.SupplementaryGroups = [ "maddy" ];
+
+  age.secrets."rclone-pubsolar.conf" = {
+    file = "${flake.self}/secrets/rclone-pubsolar.conf.age";
+    mode = "400";
+  };
+
+  age.secrets."restic-password" = {
+    file = "${flake.self}/secrets/restic-password.age";
+    mode = "400";
+  };
+
+  services.restic.backups = {
+    maddy = {
+      paths = [ "/var/lib/maddy" ];
+      initialize = true;
+      passwordFile = config.age.secrets."restic-password".path;
+      # See https://www.hosting.de/blog/verschluesselte-backups-mit-rclone-und-restic-in-nextcloud/
+      repository = "rclone:cloud.pub.solar:/backups/Maddy";
+      rcloneConfigFile = config.age.secrets."rclone-pubsolar.conf".path;
+    };
+  };
 }
diff --git a/hosts/pie/paperless.nix b/hosts/pie/paperless.nix
index a9204fc..b24073a 100644
--- a/hosts/pie/paperless.nix
+++ b/hosts/pie/paperless.nix
@@ -65,7 +65,7 @@ in {
         include /etc/nginx/conf-available/proxy.conf;
         include /etc/nginx/conf-available/authelia-authrequest.conf;
       '';
-    }; 
+    };
   };
 
   services.paperless = {
@@ -135,9 +135,8 @@ in {
     "d /tmp/paperless 0700 paperless users - -"
   ];
 
-  age.secrets."rclone-pie.conf" = {
-    file = "${flake.self}/secrets/rclone-pie.conf.age";
-    path = "/root/.config/rclone/rclone.conf";
+  age.secrets."rclone-pubsolar.conf" = {
+    file = "${flake.self}/secrets/rclone-pubsolar.conf.age";
     mode = "400";
   };
 
@@ -154,7 +153,7 @@ in {
       # See https://www.hosting.de/blog/verschluesselte-backups-mit-rclone-und-restic-in-nextcloud/
       repository = "rclone:cloud.pub.solar:/backups/Paperless";
       backupPrepareCommand = "${dataDir}/paperless-manage document_exporter ${backupDir} -c -p";
-      rcloneConfigFile = config.age.secrets."rclone-pie.conf".path;
+      rcloneConfigFile = config.age.secrets."rclone-pubsolar.conf".path;
     };
   };
 }
diff --git a/modules/core/boot.nix b/modules/core/boot.nix
index bc4cb8e..2b95f57 100644
--- a/modules/core/boot.nix
+++ b/modules/core/boot.nix
@@ -12,7 +12,7 @@ in {
       loader.systemd-boot.enable = lib.mkDefault true;
 
       # Use latest LTS linux kernel by default
-      kernelPackages = lib.mkDefault pkgs.linuxPackages_6_7_hardened;
+      kernelPackages = lib.mkDefault pkgs.linuxPackages_6_6_hardened;
 
       # Support ntfs drives
       supportedFilesystems = ["ntfs"];
diff --git a/secrets/.fwknoprc.age b/secrets/.fwknoprc.age
index 33bbe73..579c8be 100644
Binary files a/secrets/.fwknoprc.age and b/secrets/.fwknoprc.age differ
diff --git a/secrets/authelia-jwt-secret.age b/secrets/authelia-jwt-secret.age
index 5d6acbe..264ed04 100644
--- a/secrets/authelia-jwt-secret.age
+++ b/secrets/authelia-jwt-secret.age
@@ -1,24 +1,23 @@
 age-encryption.org/v1
--> ssh-ed25519 8bHz7g zKjSwAkx3AP3kn3E+Yxx3vqvKDPp1RfRqI2DXsGZEUo
-px/kpl3Emm85x8jC3FX2GTsOKlbv+yu3M9z3oUipLxE
+-> ssh-ed25519 8bHz7g RotrV3Ihh7BhnI3XM6JC1V+lHTkAcw+2tBRw8WeSY2Y
+lF2R/4ji/1wc6rTHGWtoCjgQHdxm8e413fBPJfkAroo
 -> ssh-rsa kFDS0A
-ezAH1vla7uUC7jbtsc4s/PoASi4SyD5SlHpdwSFWqF4rKwkamJLgUlfv8D0ogSHl
-iGF/XypomK4wQbc+B1fECKZGfbaXtqY8un8Zljh5rC4v4Un7twwA+uoXkUUNF5/q
-+UlJnCnJL5kpM89mpYc3YXT/E/xbKT/LcEhn7ngTWcDxgMkbxOgj5N5t/XUWxtMD
-qjv1DfXNHl95gI02yMpqmxGly0tIY9nHD1vAz87w25swr4VJFn3yjCVZlKz2+m5w
-b5SghK9ZotXlvZDLhe12+//XTbEtr3FW9cwU7Ad6ATTD15CnciCI1+wd3L8Os0In
-aV9NiGwXhThggnlDmMu22gw3QSj5f0masSSxSTFyCm/SSPL2mnlzANHuLj2DbTgA
-cNNWwIPUAB09cn0F5k1uYy1rsScaLf46gY+HWUYqGHvPaE7j2eY9phTt9qxgOWdP
-an9zktCMbJaoQ8EyaYpl7ZHjT9pfQPmmmrBDeFfPso5Oy681TWmwvifOe/lNWits
-EgKwR09yI780tELxXAZEO52rix503GtM0RJAJlifThvF5HU/FC4M7X1QoYYJsIMc
-ilhAsTlwIxQfXWTrt3hvucA4cwdfLh9USz1Otz9ct9NmfqOBHUD3eDz2DtKTUykW
-aushupzdaRQS1JIQqklzKZBc8r8W9ePO/MOTb3l2dAA
--> piv-p256 zqq/iw A6lhtVxLSu9x/WnIzsBQYYcSepbrCh9LKffXdPnY44EP
-ZsTeF0qctvTCrAn1rOxtySolyA1ERsX6xoOFWykl1uE
--> piv-p256 vRzPNw A+vnxQlBvTqe9zhXoIXkwqqmvXkmmxk5wOJE5viCqxA9
-2E+mx13FD2A89KAI95KnulBUUF3c9Nni7IGCn0LG6Y4
--> e-grease WS4 hN A;D ^Q'
-89Rq7mgvyF6s9pQe0W7zM9I0wZQmTkLU75xQl7j8d+7kCvp8t5Qm9r1lS9QTqlfL
-L1MjgllMv0Mgl10I796UM5T21QoSdY3RfP8
---- mQbEPEUmeSnOPFXoKIIc6VHOUqJqsddXnGz7ZyMvMGM
-	�M���z���O�ά��[�>S�λIunxOZ�S�e���)�і	�/l�Ve����?�/Y�ZT�9®ہ��F��U�������]dRR��ؙ
\ No newline at end of file
+gMe2pt13B5gRS53pN3B1MCSe2DaHOJquz+jowomaxQBQ+nWnMzbp91QbpOZVSuN6
+RlwcM2yfiBp4niQO7oDqGjiOJuc2ZYqEb8wo/360UvS8ngrBK6Vnars3MOL5jZrO
+SG6hLttct9Nno2hO2voHyAaRvIhDlVvsYDa89FRIwcImZdV+fOvKkyDFP4Qud40C
+4P6Di7DHVPtn/T2W+ALZucC5WHOO4rZq8oeAbIveKZ8/wYHUtjiQkwNQqtbm/h39
+c3jUvM3gflS/PHHL85wTlAdRCUkXlRIaPfKizqvj3d0FGb9FXeHcs6a5VOrZXaxC
+O+6+XZApKq+WaR9jL6DuN+3v6h01dJ92vFAecdyqgG76vKcz1euFHzsFV9Uw0pDr
+nuIoZuq3z4EM49vcWza4aNPJAjUqTYZJMIeztTUnakioBlE3iaD0ZY2xCX9zaOQK
+ufEMRinovoGyRi7aRQZPWlTcswLshEk6SJtwX4VrNOTtIHjf81N6bZgLnQfAvl91
+sY+dKZH3UhiNvOyC/ZdjJuGrDLXGaxKuld2y5z5+L2W/4S+IRXk8aCwL27VHWk4Z
+PWc0TrbDofgjEgNO1RMj7CY/RILD32/24w1ql+uUMInr79a7hP8mNs6cQl0vh6Ou
+NVIHmMpWVcpVaVxR/33qDyaDL+siB9DSZzuWOU8yHAI
+-> piv-p256 zqq/iw AwROi+1p+0Ulkgwq9CGMNDdVkd9wi4IEfRwTGpJO/kQ7
+48optXxng5Ez68KwCINRVfj1pmu2tTsm1/uZDoS9vNU
+-> piv-p256 vRzPNw A1pUeuQZzsX5Dl7U5v+FupZ3aST7QAyQjJGK74SH3Qpu
+5tFHwdvNKgyjpfvxqL3Kj7C6GnyRbWs+MgoeOg0vpIY
+--- NBTxR4KfNLPsfuiHrOslgJWDoupbJQT4CsUDvo4n1xg
+m��?��5��)a�47�@U݁*�
+�ؑ��_�I��!�~�>���4���yM��i�e�)觡�;j����
+�/in?[��%��
\ No newline at end of file
diff --git a/secrets/authelia-session-secret.age b/secrets/authelia-session-secret.age
index 3094c1a..38693c6 100644
Binary files a/secrets/authelia-session-secret.age and b/secrets/authelia-session-secret.age differ
diff --git a/secrets/authelia-storage-encryption-key.age b/secrets/authelia-storage-encryption-key.age
index e2e94e2..042b4ea 100644
Binary files a/secrets/authelia-storage-encryption-key.age and b/secrets/authelia-storage-encryption-key.age differ
diff --git a/secrets/authelia-users-file.age b/secrets/authelia-users-file.age
index e7d2cac..04fe3f2 100644
Binary files a/secrets/authelia-users-file.age and b/secrets/authelia-users-file.age differ
diff --git a/secrets/b12f-env-secrets.age b/secrets/b12f-env-secrets.age
index 0b7172e..08e78a5 100644
Binary files a/secrets/b12f-env-secrets.age and b/secrets/b12f-env-secrets.age differ
diff --git a/secrets/b12f.io-dkim-private-rsa.age b/secrets/b12f.io-dkim-private-rsa.age
index 532acd1..29e71f5 100644
Binary files a/secrets/b12f.io-dkim-private-rsa.age and b/secrets/b12f.io-dkim-private-rsa.age differ
diff --git a/secrets/cat-test.ovpn.age b/secrets/cat-test.ovpn.age
index 6dc1369..3774b5a 100644
Binary files a/secrets/cat-test.ovpn.age and b/secrets/cat-test.ovpn.age differ
diff --git a/secrets/droppie-ssh-root.key.age b/secrets/droppie-ssh-root.key.age
index e9d60e8..495dbb9 100644
Binary files a/secrets/droppie-ssh-root.key.age and b/secrets/droppie-ssh-root.key.age differ
diff --git a/secrets/dyndns.key.age b/secrets/dyndns.key.age
index b177154..71d2d6a 100644
--- a/secrets/dyndns.key.age
+++ b/secrets/dyndns.key.age
@@ -1,23 +1,21 @@
 age-encryption.org/v1
--> ssh-ed25519 8bHz7g tU9tWTdUGfcYQDPViqDzMB+0cbhx69ttVhtVco2U7kk
-A1xkW3krGYL4bWMCOujo3nxg+pnIRlabfr0/rImYU34
+-> ssh-ed25519 8bHz7g BsjMrvhP4Oymh5a1bJub3tXfAYH52u/hY4JULbKBu2k
+GkifHT5qcnr7LBa505SQXYpTHqI3JyOUtcBfLt4KROE
 -> ssh-rsa kFDS0A
-mZN2a1v/gTk8baMSw9ZoDI4hHIFm6KhOYR7vvAKjK8OVaTQcFaTj7hMsZ2gT2erI
-Bgm0iHLrFBqqrrD9Mi2Tv2e/ePW8w5omcedo7bAcgCm2rdcTHePYswHnYTCTadCT
-hhH8kuZTMfEm1FU1c/CB898qhYFS6lOYFBnQYoSTsGgx3JCDB1S4Rm2AsyXvzlaZ
-TD6H6LcHYJRClcaHU/3bn4dmiEGwYoYOcYiHp6tM4+prVajGMrOYTPucAbf3xxzR
-GE7FMl6POvkniiPjamBF4K9cE8KtIzyDJoWLiZQOGOMXh5prSTEOFL8zerWKhJAR
-4kvSx2F0UtuKgikwQBpxRC40V12ivJGCrr7DFXxSZThBJzK1PfnAyY2VRrLr6QGM
-wqctsudOHtRHt5NTK4QzX8OMqmkdM+KBDHxxbfSg0d5Fy0qM5KOH1aw6+/pLC7rt
-gdE6sn3HQMRM2DL8PxJEC3GyJVuwmC2PC0uPqpvrcabM5S9cBvoLRUwp66vwNCPL
-CW7LdSAbu4TfPlffRmPoMqjuRo0HLQ76ZchSJyN0NDscejh1hsEbl/M5etjIAVu1
-IuiG4DR2yGJQOaFcKLyxbJcMKtI8+g01cr3K9GQr1IVh8bcouReJfmzIBv0kKZvK
-bMBhkPbyjhmgRj212/+QdsXHrEUhXGe04HHwPnjo/Xg
--> piv-p256 zqq/iw Au0LMoXmBQujrAcouzeRYwE9th7w7VacTcPA1eE1xMqw
-hEaZcmAQ3ekiF/GuT2XLC0SEoHr9pLI8870g1t0cgr8
--> piv-p256 vRzPNw A0XNs/XOz2O1eud5aH7Q4DbhR9WXmJGYwby27G5FoyrK
-nVibl5qpWLuxqR6DkoGbNrHEpCfxJUl5SdUxygHarrY
--> Q]A>-grease `@,ipv 4]wX
-Xd1UCl4E88saY5AqPdzxKM77f0G8rsbqM78tBmg
---- hlcJUXHAuVi75Oi2dr01NSh4RWjruTFyzWdJjk/mQ2U
-�.��ѳDeN���c�{��r���-a��>�ɪ��`A�H��e�HD��M'tcm_���psH;���* ��$JJQ���'���#㉳ЩT�2��c�
\ No newline at end of file
+bnKlmVEFVmN2ZIdSL3W9lB8loEc4sx56KvfOkqWv3YULr+tqMJum+4ifR6RIBlyS
+nIZ4zLjuRv5iIN/Rxx+1Kd1i96mLw/YsmxaTVUY+JURj55eIVJwvgosGorMiNefg
+LETNo7Q89NF2hQ/GB+sARbUzBFD9FwRbsXnjgAdR4yc0EnRWVLqlMTlNOkhz3gP5
+pZNrIj9F8NoPAr58d1F5crK/+zd3HcMRXvBK4oso7+UQDxtMmnu+waQLJtbNtBtD
+uQ+UUSMVstr68aJSun/iUnmh1qKm6WrUr3EGh6hd6BnWgmmE6adaG7aQC6us+gGl
+urpEB4My0xzBbGgBG7wSRdjTAIVy0RXOjkpcm+jIuza4ZD7lJVvf+uQuvsChtYN2
+GoqUNyW7WYeOKOvgqJiKg/haJ9ToXG1CTU7XNm4BUT6ZJ5YM5gozWaV5CRQHHRns
+kRg7D9dsHe0Bk2OaTrnGJzLALYuX1w6aqyTqAj2Yru0wqjIPrG/5D/D3OfsIubUU
+U6slo3qSk3NUMC5rF0KqPaoh6Qe1tJl2YqvT76LXrmW6YKEBion2CbvuVkxV3chX
+FZs4Vsi8FCsTkmOOJ6Q8MKc1cBtilTZnu4nuVP41GV9Qlr1p+rT8m2FdLYfK78yp
+24p+KZEExVDTFdP3MhOZe6Rzo3SYGcmiB7gvTdibUZQ
+-> piv-p256 zqq/iw A5YPKnVNMiN6Fxlcx1MVkZt6volp4vIMiw0MMoPlWWxA
+xlAZN+boKnWrBSjjyzY+lTCyTm+koVFXYQSwV7i4pFs
+-> piv-p256 vRzPNw A4UC0Y0xwcsxEdKPWi//MQ4f1k2BGHoTTg7WvqbzRCyl
+V3U+7Icg64u7Z2w0GevgPnJ7TsUZv4/UM+hJiJr9FjY
+--- uDowdIPDRxwlvoqrI2s0waBb3aET/akaOby6Djic2xk
+�R
k�(�œV��0��Z9j:?eP[����
���(�Eϖ��:�N��~�4-x<��ї�� �֗5B��i���o!�%��3�N�I����r^��
\ No newline at end of file
diff --git a/secrets/ehex-vpn.creds.age b/secrets/ehex-vpn.creds.age
index 8f81ef4..8a8453c 100644
Binary files a/secrets/ehex-vpn.creds.age and b/secrets/ehex-vpn.creds.age differ
diff --git a/secrets/ehex.ovpn.age b/secrets/ehex.ovpn.age
index bfea4ad..79800f4 100644
Binary files a/secrets/ehex.ovpn.age and b/secrets/ehex.ovpn.age differ
diff --git a/secrets/firefly-cron-secrets.env.age b/secrets/firefly-cron-secrets.env.age
index 2dd0452..866b536 100644
--- a/secrets/firefly-cron-secrets.env.age
+++ b/secrets/firefly-cron-secrets.env.age
@@ -1,24 +1,21 @@
 age-encryption.org/v1
--> ssh-ed25519 8bHz7g ENnUFWaMTl0qIRuWwDwf5LU5SEJacCmNbF4kehtytns
-8B01SNu4tpN35J/WPACTfwxm5+vy9Xr3fKWxtTcSxq4
+-> ssh-ed25519 8bHz7g R0WYWSyVVSeLlLQpiJsEY7FVxTV9c3q1nvgJ3IUtOVY
+RGOGM910teSKF1ZaaJaBGfo6CMjW5t7X+ApAg6R0VWg
 -> ssh-rsa kFDS0A
-Iyr4T/9nLrXnNF3t46B/bb71UtmrZ6Q2fUUrgQB/IY2mF2dkOg+Z9lslTu+cgvFM
-9A5whPOlvf9K5Z3X2pItHjLZTQuoyWevye/Nz1WHZ+GAMoVSibDzJao13jxGZ5C7
-elMV/22x3VvPQrwd7UcOhP3gB752sXcwiOhUjn+WWZYbvqLVNSmnZt541xhcTEmK
-Ef+/Mx8WwY9L+G0Coy8oFinhj9Uwlq1M9o+y27ehaUCQakvaRhxMwB93ucJYq7fT
-5eaDHv9da/3KnF0o9dAtvEyUvfjuDVcD1a9bX+PB+Ctd7liRDFYRLteGBX5oflzd
-qYVUHqQuXBmO6juBXwA0qe0mgDIoHIlPdFhdvUVec801OBS3OUwfpjm2AVJeFz7w
-kYv6nkmOmJoaSduwLgGkZlJ9XL9kt9x6GdThUYfukfDuEEV/9d4hiS2JvRYR9LJf
-xv8sbIG2L/WeUROqOQ/CtuhfHNYLr/B086e199EfoDoB3I1iI/kezsOqIFt5aYlF
-H7vzmehS+JucpXzCklZEJ3o87aythD8ykjJ9WDrh/Rdr2ChchyenlPN4fe0oSq32
-TrdXpyLUeEUfziq+PZsPYYFqeIdIrOcMML7p5aR8yEJFLxYi8+cMoomgsU+36DW2
-SaX7wAV+ypBQqfk1SbDqCfp38euEikM47E2zEAVPlJI
--> piv-p256 zqq/iw AqcF/BWtdsliavHR9BQvhvp4fDt+PNtL3Z42Ey/Q7BsG
-jAZJPrf8fT7vWG43uTjUCStQO5BdCu9qWM5RcoBiDGA
--> piv-p256 vRzPNw AoK+Ey7lxHQuFDuv0QVvuCQ0SJOT/PaAW8VK6e2zHDg0
-k4fachnuQvB7US1l463OevoiHGEpijp12XgZLOOzDbo
--> uzP2\R0P-grease
-BKMYkkT/SqLY2jnMb2pPUtLLH+rKKfTRA8Ci6KM42Z0nQY/fwgudSvxNHFEBagjY
-VnZVvYeKOuyw+jofGhWqQJt/Bx/6i84SrA
---- zZIJs/tZNBvXHUHkUGNC6XHq+5Wqb9y12cf2Iob2oBE
-tf=���ϐ:$В�A���a�+	��4D��v�
n�\��w6�W�	Gr�6�����r�Z��{�X��-�G��-$�6
\ No newline at end of file
+NNJ7EevExfyPejpYcalhFy2smBcCbXjgacnw2UryNPKa45mFFevTdz/I9y/IQZ0j
+JbnHPP1YBUQPAN5T8dJsC28cQkieb6Vf+6/dcIM+PCj4tr1ZSW1c7dfx3/jmGxbJ
+a3KNg7FQQw8/d6PZXUJC7YiVpgMN213y9v81lQoz8khvxz7H+2HmEOxoQBI6xbPx
+mLza2s4kZn3FPzwleXTBo1vuLCgCRLdrl2OMscTzsGVfFroeCUdbSPSqIva2kQeb
+mR6Lgc+Tl4cWt3rQJu/9ErkrCQhbpKoJ5UNgbPiOYRWE0VZe/2gvCfCN6A9dSOTi
+H7Q1Jsd4QnyjRdLfV/Znp0NuoNrv2TmfxcMn7ayQTA7tvOE/iMXNYmcTeW2SIe4s
+8piain9MJF3l2VblFSE3IchjYAgj1kB4ka0OQ0kpyA4gXDI+1g9PKrys7CCqhZ1l
+1xDQax7HoKDz5dqLMZBqeJnfH+EmuUo0uRbhAfwIipP0HLuHHEFPk3zG5uL/Pgst
+WGEWZ7EGadZ+sK5b5Xdkvv+o1olNE/EqNkqj/mRoUhJeITY0eITzwwG6JI8Dzb+j
+RkSIiyaZFh+JpR8ZjWV6MpZQkT/Mo0poEQuknSXqDQYpHdMjyE6RaKpM1PXaexzf
+G4zA9s1i4WXBqr7C68gdCRcztct2XCBsuWs8bz1r0RY
+-> piv-p256 zqq/iw AjIuJ0dOqm8vUWeddgzbCkzD6lUsZWklWVoGDqxAcfSa
+O2OFvyPrZRXNLIZnRS+xfRk0tdRTP179O0h/3f0p9mg
+-> piv-p256 vRzPNw A246JQj+JE44ClnvyxCt8hEVZSWe0mgNUkWEZ0KGyRO/
+aA35Tuy64+Tkm6ZHwfvjCgevmcaH6P+/KETx2C12yp0
+--- +/DJJEx0u4UW837/zJgrO+V3OsdYPemq7K+m23oRvL0
+XG�@����آ��s�N������U¾vF��v�՜h�H�5������j� Ů��@���Hv�YZ'��b����O.�d1�
\ No newline at end of file
diff --git a/secrets/firefly-db-secrets.env.age b/secrets/firefly-db-secrets.env.age
index c7ff9e9..29f1d85 100644
--- a/secrets/firefly-db-secrets.env.age
+++ b/secrets/firefly-db-secrets.env.age
@@ -1,24 +1,22 @@
 age-encryption.org/v1
--> ssh-ed25519 8bHz7g 7fscDY4cD3eU+uV5ydog2IgaDXXEOO/J4jSEo3smrlU
-51LfcGo3091EYv6MLqzN4+SmfEAaCG2AqxQygr5m820
+-> ssh-ed25519 8bHz7g 4izyWGpSUXdbEmhe8NA6oNYFIM7SnQ1epfIka/xrHHA
+7JEaOrVFBjld8bCeV76QE8CPNdZ5PhKJovHlzaWQcrQ
 -> ssh-rsa kFDS0A
-f7h6EH4h4JeCrtHWUZwu1QcYMURD/O4yvS1ZwUmoQSZBhDmwnR/OzOOQVB79plGG
-M0JaQohWhVldmPg3KX6Aq4uDqgSWsYeO9Q8BYaLBZpiw83qgQAhkqv85xcSSTGuQ
-eZMkr2aOvEMf8pOpmzPLvMiFI+Z5LwrvMuMmptGmUY9sJ/kp9ngjblJxtGk32p3S
-RuKGBY6iC+swpK2+BQy7vpjGnRXcUSuvVd/Nh72Vncamlm7BKXdYbop6UM1JYjQy
-bag6Ud2mEZFcmR+E0CTGWTD0S1rmce/VM/Lab4DSWXQrs6aB2UybOeCUF3eVaPE/
-C8UCeNKSOF+sRiiGz/vS68JS9DL5buhhnYjsjGLLt0hJ1KN/YT5MyVZN/bbGqZz2
-mC2Yd2TCF61v+7Zr763l2hSLztTPorGDiZV1a4WAujRP2uRWxbVz3io86NQNXc3d
-0ExybZ4nBEWJKd2yWTdxzUVVgVXZecwfWIXAOQML2TCJAz0cHzzaZjdfW6ACYr0X
-DtPN9BBFkrxboCENWjRcy3lniaIi8ef5e7ZmstbvjQxlMjBBZzE0dlrINjfzgQrz
-tGLGbzfmvTyssIs4+hu+ldpxF1xdM10VGP0NHk7P9PwjVJDtauPgfWL5SvnvEePP
-MTe9J74IS5ZKUpkbYc82pZ9N8ZuzMYmz0v5T0r+bj3U
--> piv-p256 zqq/iw AgJRcywG0jtOF/Jy9TVEFkXQjYny8NtVpl7SZK/QmqGs
-ASFjv9Uda5pR7C6GLpVxTWATcdvTHX7+nD2KPx+5Gr0
--> piv-p256 vRzPNw AloLZJP8lW8iWp9USg9+UQqjyZbvOlrkPyXzk/xVFkyl
-V75Xdr62EO3pUUsh6WEJyKEXUfaUfd+igr5qLmhSzKs
--> Qrs?o-grease
-PFTlH6gTXESwADsl6c7YM+Ut9AbgJRMS1SDwSn1kFN/NTNNoDtnqzLS5fi3bCxDe
-w/D3t6AQws0u2g
---- 6A9h83fQQ9fT+2q2N30OIwJkTMBTK8UzFSyWVjGKXpA
-�#����P�R�-��խ����PE�s�d�V��跏B��ۘ0AD�0�/L;��Q�����ݰ�N
����[*����(��7v�z�T����RZ�B��$du���������g^ʨ�5Gc�u	~BFq�*\uU��M�)g��=G�Rm����/
\ No newline at end of file
+Ett02wulcs4akFhY6EdGInn7Nnvlx/Emsu3uOmOfdR2A6KckWmLMSep+FvvIVUyH
+aCeWpGeWZfNMppv4V0mlonOot/4Kw5rT/sAUiGI9K1fRfte3TKjTztDZ2grW8RUr
+JpgS920gisEOPMoaT86tGTJz7jme+bTUL5GUsc/diGALAgKmNCgawnRb8ESpoTju
+nlnNSyrsKZptP51OajZDi8eQ0cy/8NwIFhuvmw3dc1ZyMA5cb+1Uhqf1mDforEkF
+p6IND9zlhrVieliw9yKIyRNryN6nE/LvTm6hMLgIjbQQ7EqgnOJBjj9KsZcY7avP
+7PyI0xyAFDWZIf+3COY35hdH2NNdqSSm6n7mRXu0QSX03x7ljIhFX+v44DCxZ5T4
+eZkVUS4rIdt1NQKmXOJKmiGHtS5wTw44yGcz4oYIoHE3qHD6N5H2I0DSe2JsrFfo
+J6rtMFzxd7W19uqV0S9VG6wNcWEXXir36AP2cPZ2aiiK1ZxOpMPvGY7pdz8cT7H4
+/f3ka1ExkyskGOQGYMZVtgN6pajm2QOjMVc2XSRbRb8vc90njhRoTvk7Z5/LDm/G
+rwa46h3b0BuK/ms4+xPMTUZh36qP7mNp5eOu9B4EcjjAmU7iGxzf/HSTsfrYRIr8
+z/opVi3PWJd1u06PLu05VHn4RVUEyjziLS72069MSvc
+-> piv-p256 zqq/iw AwgjNr8RyikJeB4v2DOzJw/jBNS42Uo0fo4Z8bkOTXWM
+prUIRqy75eWcBV+x7NRvR6CIquSl1GNXHxA6+axwTeA
+-> piv-p256 vRzPNw ApKfxgabdcLNZBv08miR4D10m36BOwR3SHdNSO4UZEGe
+vtUrKbj6sqhO/c2fFCu2mCjmcqiRyAS1GXq0ziLCztE
+--- bYXRZnT/Ax8P4oY+kgl1vHGpreEjr1D2eUiGQKyeF7Y
+���<=Lh�u�1��f��͵��h�������=f�}�6֡�`Rv���&�oю�Fa�w���m�T
+����R����{�%h���y���yP�Б%�+�g����<��{�g���s����:|q�E��)�W����lFr�\<�@��Z�cS�
\ No newline at end of file
diff --git a/secrets/firefly-importer-secrets.env.age b/secrets/firefly-importer-secrets.env.age
index e6e140c..955cde0 100644
Binary files a/secrets/firefly-importer-secrets.env.age and b/secrets/firefly-importer-secrets.env.age differ
diff --git a/secrets/firefly-secrets.env.age b/secrets/firefly-secrets.env.age
index 69f7bac..98c9b7e 100644
Binary files a/secrets/firefly-secrets.env.age and b/secrets/firefly-secrets.env.age differ
diff --git a/secrets/hosting-de-acme-secrets.age b/secrets/hosting-de-acme-secrets.age
index eda2deb..241c9b0 100644
Binary files a/secrets/hosting-de-acme-secrets.age and b/secrets/hosting-de-acme-secrets.age differ
diff --git a/secrets/hosting-de-invoice-sync-api-key.age b/secrets/hosting-de-invoice-sync-api-key.age
index caf6ccb..35cb35c 100644
--- a/secrets/hosting-de-invoice-sync-api-key.age
+++ b/secrets/hosting-de-invoice-sync-api-key.age
@@ -1,24 +1,21 @@
 age-encryption.org/v1
--> ssh-ed25519 8bHz7g 8rdlpuz3TCunjDVAO/PoymA89EQIrruHpR6JN5sIkkI
-xXN0koSPwM3pCKpH2qDRImvYq7q7azfNy7ppq2rRIFU
+-> ssh-ed25519 8bHz7g +5Rcgx2Dk30l5An4H89rqZG1BcPijkgTqQp8VkzTxCw
+3Fg+HyVnd2EzVgexvIZuDdx7MAixFlZV7HoAAPmLwb4
 -> ssh-rsa kFDS0A
-I/iVl03DlSfPxRfmndXCM4VD6NGfmoRsHIFtRQSfB58FrMsadgRc1h+pqKIaKNcE
-c5TYcFOY6k4qOjTHLksTrs9kCP8TOVv/nlEQIeArb8qNnHJzNQ788iIqlM7Mbgkh
-xwHo3doAuckNOK0IZms+F/RrD3DWAOfagwxLUdmuwda6NqMHLZN9lvlkKadO7Aaj
-jO4WhNBF+t1bhEl9xogntgPND3TTWEN/RhlTCQF4PZteUhjjdIcxuELWuT4BDKEb
-XACpHsPJYMi/9IAOGTGqTkeIs7m4w8hFtbOLl84DY4ec03P3VGmPNBzpU1A9E0Sd
-czJgPMGFIGv76UqvFTXy87Nfkc/QNJ7gtOzmAuu5674kmVisMl67L/jk5pqVRgO+
-UyOf+A56Dt+224q+mgXOeMW/NdUDiVuyO/MC2Yai5H/w+sSF7pciMrJ0a9GFj+OK
-d5+qxsLOr3SdskIA6aOiFp2JhvvWDgZ4UIvCioCG7y1GqVpnv7K/7Tjn9y4d8LSZ
-nhpQL2wOTJ6sOQAQ5oc5lo3nqCv/QF1XwzoGo+L1UVR5WlsM9mJNoD+yN/6gD0pe
-3B45iwM0MpXy5N2qiT1Vhy39+Khh5vp40tPQDIqFuGvLAzRRrKjl7gp6QnegDdqX
-XiaKLe6uEkgyU80lXv7qDrp6Js0wGWde3x9ll07rqLk
--> piv-p256 zqq/iw A3ojWGL4IKZCMVPeVXZKeWNDLaZUoVBGqubPRvVKjaJb
-PjLiZ6QBcaQlxeAcUqTvlUQ0yEbAp+1/0qlUxewVKDM
--> piv-p256 vRzPNw AnH19MCu/ep73iwnA+T36tZWRNCcVoT4P59KQAKqj89L
-ztwGjBpEKOahU7XeP543/WdNzBAo2Lr+XU9QNtDf4zc
--> Z$#a<-grease /+|s (q^%1!;i
-uAMcvqH7cObeEscVhea8W+PC4zYrAzOHZW+HHZjWbfhhUo6ydGAnV4JG9x9UEnll
-eHTMATaRlI6G1vjxYtA
---- pwCLEHC9XL4kYGqgDiqio8iIKKVLbCdcUrXPAwwZeE0
-�g�s��SʍLZ�v�P�.g^AX�Ͳ������%+.�V��AD\tΊK�-��Mئ��aj/AZ�b�tb��Dv�o*^�
\ No newline at end of file
+XMuo286aoBHQ5eFLyp57+J7Sqt7GVOnSaMjHsCgpsa7qMQEyRuIuFreuP7SpNb62
+r63XO9/PXoGwAiM2IP0lFh93Ld04XWqmfXggeJkIeBWsfOVoSyzdYBV8CwiXJWQE
+olkTXnNgS3eyYDZ34w6dWBKTYT8XtAMzr0TdRemn2Ir3QfykzUdCgPGVS+NDq8dN
+WLjj+vBHJsG939B1jeQs8BcmNjMc9DGXek7xMr/dAI5GO9BD4evlFNDoMbN9XwGk
+Lo4QsEcq9+IkGRX+K1cz1/PfCkO8I6e8fPJskEWDm6daSFlBUrG/JCwJIfS6R3BT
+1BdCK8VisDdA1SJ2dGo4V370M9KqbOWSsCb64me+rTqEYgyWETeW1vydFnIKlHep
+FuACMClokWc0rRE151Px5fSCDAepE17+0MoKYnBcEfY8aUFGMqXpc6MNjjsXdu1P
+bR/EOdJZhXrxAsnO8TgnoeiXIStorr1ALBQrgQvnFTclKGWwu3JtVa3vXRaevq5q
+d81Yz4Gs28MIIPUsk62A0bJ9JnE93PkkGqMmzUd3Z0HrsSJAVj1bLvRHDCGQs7F0
+XqX8JdvNHqnOBTtI30biH8xeBEL2ncf+WN941i64IwLivumrFG7rWLpDHitvSwwD
+AJMBAM28Wkjy8MusKohUylE0u1k+xxmX5CKIy1aAQnM
+-> piv-p256 zqq/iw AnvYCRLjBiNIessZcO43FQkSVIJCiDh+EkUV26nH5wD/
+Yw/+qmh0w0Wms88xdINq3GJwqGQA7GXEn+prmwFgt5w
+-> piv-p256 vRzPNw AhDRRf7ZkuSAB1VDo8bUD0M5d7TAjF92YBqmPdVQNbQd
+Nrq3YLLU5w1JN0LUDTPiO/Dlis4Y8NJ9Ew4F0NxGO/U
+--- bQta7OGuMIU0sSXlA7OTLA5FX54s1mvgvG5BVcBR8RY
+D����N:�3��1���og4�m��p���W�6�p�BRqcK�6��C-���{����$��7�q�_�%2�?�:(A
\ No newline at end of file
diff --git a/secrets/id_ed25519_sk-464.age b/secrets/id_ed25519_sk-464.age
index 2d52af5..4182d4b 100644
Binary files a/secrets/id_ed25519_sk-464.age and b/secrets/id_ed25519_sk-464.age differ
diff --git a/secrets/id_ed25519_sk-485.age b/secrets/id_ed25519_sk-485.age
index c779896..99abcec 100644
Binary files a/secrets/id_ed25519_sk-485.age and b/secrets/id_ed25519_sk-485.age differ
diff --git a/secrets/invoiceplane-db-password.age b/secrets/invoiceplane-db-password.age
index d94ce10..bc68191 100644
--- a/secrets/invoiceplane-db-password.age
+++ b/secrets/invoiceplane-db-password.age
@@ -1,23 +1,22 @@
 age-encryption.org/v1
--> ssh-ed25519 8bHz7g 5XO7I95Ar7qL5JzjmfSjDMEB3IIph7CKWJP67u0dg30
-jq9A/szOCQbBk+cUUZv2OCkZZq8UMy7fu+BCQPbYF8Q
+-> ssh-ed25519 8bHz7g GCUMYS3DohitxcqSWiUK9P/L7wZtQPI+kkDwHfUWAys
+eC88eGzIjHiDzxBGLcg9oSx1tnD0hYMchO+/p+5y6Fs
 -> ssh-rsa kFDS0A
-GIK2g7tPYcFOTbz5TgXAKXutVQb1namPGw2pfzf8jabsgRlQbWXR9xo3TgySlOZC
-bpbcNs9LOkyG9su7R0Q3VB/AZYsp0mixfh0aAcFBVjh9NRA989vdqaMzY5e3K0Rv
-9opc/YYdwSagHfC94BbwP6T+MA+3ukpm8tTXRudxZGzjRa7a1FWsBjHipqfUqGPT
-QoZRcaVW0lBdNA+H0rcwcYP+vGoHYO58fkxIs5tj4//uxasyYFRN6k1BsePh6U2u
-MiEaotlCoUKTjJMIh6aBArsFzv/s+5i8VQhL2YXzqCCk0hg1EyH1B3iHEdEwSskz
-xNQPq6sgDEaAk4K/qSFKLseen8DWFz2AL/4jhEL8YZLtbIt5nwg0PXley8M0hjV0
-PitQEfJuhyd9HtF0WdXY+DjnukeXDrBqfPZcRLZPvazxSqo4xnBh3t/39GFh8Rrw
-qj5sJ+shK7SnsbmDG4bNNrYDh22RfxDClInn89G7NRfVeYlqyswVh3cpNhHLTsGi
-ucWorz5NFQ9QrY0FnlwQjsW2HptjhP2ZZtCP1AJi8FQVg61W+MC+XumaFLhEa40c
-6Hn03r4cBGS90N7MTtdqcyoVIeggEdufI9vtDY/lrfhy7/e3I2F+XfuzmR3vORqs
-qEmiHDzH/SAD/6aSOxtXqTKu1m+LfG4c55WhlInM9HU
--> piv-p256 zqq/iw Akln6P4WFprrCdthyn9HDY1GB9AA4eyBoE33TvAbgE0X
-IVENAfkcJCeJo9+Wgt/5kZD0y5bwQsefxN9MyejCbZs
--> piv-p256 vRzPNw A7GkomUc1J3NsSxiS/HcyCwoIxU5rr9yqAGGFWHP1+yc
-bXnxRzxyPfa3LWq0uSJONl7NXKR5wo3/xkib9w2K2oc
--> zQ/~=RXm-grease {kc Z
-xgcrCpjjb1n9hFM
---- dEfgvftiM5d+B47Lyg+Mgqp6mt+XvBWFP3dIy3p7Nfs
-)��4���fs[����J?I����D�I����
��̢��q�S7�-Ue����S�m�4z�S�
\ No newline at end of file
+U4pz4V2pTFOb44OO3V6qn3V9fXEA4dU5cHW9xWWdwePE6TLxZQeIYl6vpciLptlT
+pjyzblSxva5bIk6zBgaQ8hnr5K6zaEkreSPyUWRfXxgcIWo4EznHKNgpGFDpA9iB
+qx1vOyULamez9oKL5UHcNwOF2SSZO7wErH9zAbP++uPZA5IMRO0BqWQX0jOPi32j
+UyqfJ0I1RgQBKZfYK2bt3PhKCQzAiLwyQh0UYZmEw48O9a97GYwDCt94wgARXes2
+v9noViXI5u9ejU3+/gLnCuJ5PnqNDEPTbuP+OTKZqIcitWT3TDycTdWsaJGm/47M
+JBWilfEg80YP9eY9TVwCGfiPEkr756wLVCs+LBzRPa0UlnE391Mwc1SWdfCaSyia
+okNiukVpvntwLYGkvbU9doxDUiG7VbbB9YZWFZ4A1S00re8G1KnTphM+TqxEuiQK
+ALxPO8J8A1mgsQUrhY3dM+oCy6j8zHbJaMHA18MXDmqmmLPFoLDBaAEVH42CkAaw
+HQKF1AVSLTvNv3ykXrbLrZlToz3hCjo+Wbumpt8VvVwbje0/H6E7ZSTALaL89kbE
+5bmRIVuLVTXAC77atZqIsxsO3kxdyGJwyfUDYHBGo2t9XsSSDJdu4p1kym2o7O1+
+bmJK3QSnwzolB1JpM0erPFqijG7j7wUfa7wokRdjd4o
+-> piv-p256 zqq/iw A9dWqN2aZei4fLAXthtPoJCqJjU9pxoa/tcGc9codiQk
+M6p2p2UXlb5+dp1RYJDtzeZerlf9r7XIwFAYchTwJzw
+-> piv-p256 vRzPNw ApBaCN2ssXwrKbkJ4YFEU3mjhMASI43QAUkxzOiO3QQB
+pLbOHtfDA6hNDJTMY1bvhbccUtmxLrjEO6gYaggYvj4
+--- XD4eY/hFAe8lxi+0eOsI8GBPzO2dxeaLIW7iZG4rueU
+�>6# |,�
+8G����D��G�0C���0hE�~�6\;���7S@�	20>��L%c���A�*9�Y
\ No newline at end of file
diff --git a/secrets/invoiceplane-db-secrets.env.age b/secrets/invoiceplane-db-secrets.env.age
index 290ec37..558e976 100644
--- a/secrets/invoiceplane-db-secrets.env.age
+++ b/secrets/invoiceplane-db-secrets.env.age
@@ -1,24 +1,22 @@
 age-encryption.org/v1
--> ssh-ed25519 8bHz7g oewMn9LfLSeajLLLaTNIVflicPqCdDByP6ryALkA0hU
-+xjla7Z4cyxWBQP/t6lAQmUviCoxtaYMTU3oRFkCY/s
+-> ssh-ed25519 8bHz7g zdCO3NOnOmV6DXU/dFr5Dzdtvl6+Jx87+n7Jqk1JIm4
+R1M6OIUN4YHWCdpUCcAUNs1jvvX9TKq37Wb2swcjlKM
 -> ssh-rsa kFDS0A
-hC3tn9lXYqlN+X6x3Xv6YCoi9YXzPykaauDN/X1vyx/M1uiXblmZ2YM/5L2jtkzZ
-JOez/eogUXGocxZnOzONg5E/dXwctD9XGOvTTC05CzUUzFvPEYG7lk0qmXvYj+8h
-29WTT1U062ZhQsZcenvInPp/vhyFarO4ytot0J7/qNfaazGJmTa3wgx8LSmt3605
-Ocob+egWtHUWsCdJqvqsh6NOfFQo5ADHUtC2Zl/MVWaSjjStvtl6slAOzhxtyrzj
-gAIcdw5AcLDc5Tn/eTpH1iVKzsyFNmin5S8giW1U/k8A552cuHIXdWQ0rfdoAwxP
-MplSUoOf+1rWcwkYg6soIIrie0049muX/2BHfaSuC8yb07dgKZHkNMEe9hFi8+aF
-bwdBF3vhv6zXy1Pz8W8Qv/P7PTCRYbTwpMV8JN4HtYHG2BaOgntXqPVjYiDWEavM
-B2sKa+OP+j0T/lx5rDL3+/OsJAONkCGkPiuboo2Wg6jl+UVTlPz6Ht6uxY/UniK3
-313Qf2GR9MxACoeWzoxdO9uMqK/KuRwTVjcPlRZI3NItlDsdEe0V+7tuiqsgs1oc
-eQKgSJhEzqEcnfSPlADRrUlDvYUx/1THRmeM0gx0KxYtab+YNEk+tYhMna8Gd5cz
-FU5EEaNWfJ7zApak35m21butYKlewiZvguRBNv06g0M
--> piv-p256 zqq/iw A6mKdGtNQu6tatKQSLR2pPiRlUZRFwVcOwmslay9ePCs
-Vne/HismzgWiw/RF28CAo6IwhCpthiGmozl36aWp9DY
--> piv-p256 vRzPNw AhqngIDABhfM51sbNpUIqdNxxAG+VRWivNRYfnhkZSg9
-ofgthNeca7I2+JiJ0XxcN0uKlCZbmK6x8TQJj0S7fsk
--> nd0-grease &! [z yc
-cLskoGYDmtvtksh9kpG8Z283JRLCJJIO3odU/LMddZjqFJtoiOAiA1jpwfs845ep
-Pm3za1ZDV/X5WDqthcDq6dsme0494FMcLTQ
---- 0snEKSB28jBV727rpY//xLoYkjy8SEaMD+a48gqrPzQ
-`�Ę�؁�7�����6\ϯ����.x>J���^dv��Xw�S�c�8bLu|���c���Y��N���{k��]	��@⤈�I$��be��*+��̛L��;f�
n�T�9ƈg���b�{�v�(��4��Yj��ѱA�=�ҭ�X9�����]�����׸�7ݞ��D�R9���0�^;�Z
\ No newline at end of file
+cX8FzJR3u6nAsrFjIgjWyTdMCh8LdMuH7mKjXSrkDODXyKwOkmkM2rKvbQpimN6A
+NOvvkeQwLKTYqsTU9D9j9Aan6wUyb7lt/2qbJV2zLbaaNCXbgp2/BT0yMxTcogmD
+hb61MYZEzQnFcBO+fywgTdqNCzTCaksdQ1BZOIswWN8PFwu+SO5VbHRGovwKeepw
+eJ3XzhHZA6aS0bGhj4vNRNWR2fS2nRo01GTlP3agvwAOUBwdkgfEuSRYsG9Ufj/2
+9wDvT4tWAx4wT7VatSuMG497//jRVj+SiI8Mu9Xw73iwopHbWqo39vaOs30gQTdo
+YigYQHvAzEJUmaa5TNxaggUR5WC3UPt61aBzODsYft/Enoi2CsAlt/Ry7giuaKap
+zIOAYAYr58QkjFvvOEEVpNwNco9PbvQrrVNxq2e7xKWvbYNs6bFM5PiA5FDsLgYn
+BEdGZ1msPPI4K2gLfd2VEmB13fMASu+O2KXWO1aNcmgb4BWimmpAzQfXk1WGh4KQ
+osALHqtzcp/b/IAREQ4D2NySmxsStIamBc61/T2xbiJeSRTxtERwd2O/Hl4EIZ2W
+g28KGGWRaeg+TijIjJDzhLQfLY/ohUCuRtouA4aL7hChfqigJlAdAmzBSl9wtMLA
+gKxbXoB/gHc2iIEobvOFHznuVtTPG0WP3xuVlRgtQ6g
+-> piv-p256 zqq/iw AuJSB0NuLwQTcnbLOpgYjOacU5teIcjfJjxNpyrMxOJ9
+2HCPMshIYDGk4PuVA+KNO0/puqRfWJ4DHCsOSq5/VS8
+-> piv-p256 vRzPNw Ak4Y9LkOYv+1TCmynmia/8QJrLkaGtzMObjJ+Y0EMmNn
+k8amQ89cdOUTMHDhRL+l7qqcOCb4P5XELXgTDQRByXA
+--- c5IQHvq/hjdbIjhKivMpbi8kQUxaQOf+yFY84nroKYc
+8ޞ��J]|��D/�� |4�}2�o�m��4��
+j,�a��g���_�����8�@}���n�]���b�
�.3���\m���h�Pb�w�'��0qg���K]y�*T��d�s��xcg*�$~{q/®��|s����O�1Q9�8?~T3��X&T?���T��9�gGkw��X �pr�:��
\ No newline at end of file
diff --git a/secrets/mail@b12f.io-password.age b/secrets/mail@b12f.io-password.age
index 2d44de1..3066e05 100644
--- a/secrets/mail@b12f.io-password.age
+++ b/secrets/mail@b12f.io-password.age
@@ -1,26 +1,24 @@
 age-encryption.org/v1
--> ssh-ed25519 8bHz7g mhrNQ6X4FHzNvLWypw3zx0ckYU0t8cBkjl07y8zhSGE
-EZGdtwFYi3+LEZgv/JcV2K4qdypFq15Gguxfs18lWTA
--> ssh-ed25519 n71/yQ bZ1/2BHLKcNhD8EkkojunsFOkag4cTfE0L8maeLxyRk
-kctlXpT7nWdlcDlBaHiEyZ8AA9hlMbtAhjYHYrFtSjk
+-> ssh-ed25519 8bHz7g 6CfO8/GUh+78jhjlDPV7nD7RjqYLqu6vu/KDhRwlVX0
+NDp55LBNZr+lpWffjXR3G3Wt14x0tI10Dt92AB+umIE
+-> ssh-ed25519 n71/yQ 1+ZwhPKs9e0/K8xO0h5v4IQRaAMZ+tYgUdB6a9nra0E
+ErdtNd5iB1/c7sp0KAUVuVrgCmMMo7Fxd+1froFWbzs
 -> ssh-rsa kFDS0A
-lgRrxLpW80twjIgj8dYi8WiaZeDW9nbOK1PwIFn830H6K3uD3v/1+UlrOmuOLakV
-ANRB2VNJlzXgWeg4+VKLc79qYmX/9LhS46QLrzENx3KKKyXyBqf9F7XCbHu0J+95
-Wt+XA/+OTy288AmFgO8Qa80WNZce712Mr93pIyfczisyGf8IiMCpR2ul+4HDwty9
-c7Q+rfKZixaIJ0ybRc+vepV+qovjgXaPU1nFtb/tcCWmxA0MO/zrltYmor9GeD5H
-seld4mYDdJ+HmrQMkIAodA/WRrm0woKXk/RP56OOhp/L/wvGJy5hKb20ki1+u5l6
-MIbcPNuwp9rMs2G6Yjv/Vt+pGpChxoU7kB8TnK9iJkn4RT/gGi9A6/xocC+U4/OJ
-Qu6zWs7M7KNtn4m29ZrAgjeNVXMOiKvP89+B0jtY/DR0lBu1fqhE9RjNQ5Ns8CBD
-wsoAO0wsi1n0QB/EHYabph6itc+jk2dA0DDqj2H9DClq6YPLRjcJfWgaXPpOtJK1
-5+rOwZHJ/MFXDGXJW7D+ewNIbuM+vNO6GIxYLpEcoyigJ9rREi36yIMo/qASdkWV
-KVJ/nMHxf8Tu+BrgtMXZ2YPV9+2Acmdh7kNaHmWSh7qJKHUJA8TyRe3jZpAC5m4v
-bDUCcIYTvhdfGMSgkxhyLCrPc52isfEG4YbEHsx4XkA
--> piv-p256 zqq/iw A3VtBWDegSqGY/LyA/C2GEzxd3+NE5MBaFyuJzQGuQwy
-KtUPPP2PZ5ZaTYq2XPNR2q2JOlxWCdoZ4VXEeETEFME
--> piv-p256 vRzPNw A2LMV/ZownRHylZjThU4XjrXi/FTbO5EIpcxLiE9/5or
-hNa4N9vuMsEI6yCtmT1qYw/ilurNivDqjf2X+Irzo4g
--> c/-grease ##C EpP`;[_k E=V56~SX
-oyCtZqWQ
---- E1vLmVyXPABdiO+H22tpBRP2x/tdM3Fj0rzRLrrYTaA
-���N�7�"�W0�LJD�'�J/5���0������W�Cm��d�v(��#�Q�N)��@U��
-�V���R/��#�����t�b���L<ܚ�۝�T
\ No newline at end of file
+STcEPFCGO8PXMTMCwsuil7MzphInacvK//W4nQMfVlkS1eDs9Y10cnx12Ql426J0
+QNSs1VUk7jeuXjazTgV0UDSuLRgqpvtjYayh95ME1YHBLCPgYF0ynRk7Ixa6W+S6
+zkUYDaNU58SAaEiEuArzW5tmKV3EW+BocxYq8/11KCKeGf01vB1NLnPxJhMcQjfs
+o2Bi9Cy9R5PbEAk/ygXRWc4fTCaPeVyZ7bo2sKk85uknvqGQHv3voyqkzVnAYg+q
+KTHbqJ8+vcYXkZ9rorRwVhaxUw9jpWAoOeJx2ElqFyCgBFdnkxMdH3D99AaB6NyM
+qDBTdW16dKWCMcFbnfEIy41PjXTiA8RAjpQpqBADF6A9uzhK0IG2CT/JUs4uXlnk
+5RM8uCpAC50iQtYFPnwf6/IvEh1QknEsQ8yb0M07slgGzuAEdjWd6E+f02eu1Niu
+rAvC0xbox72FE4r1+oOxdMBZXbm/EuGU/OyWtQU0ED4M7JxTMZ7u2QfW3duHfcj2
+UhEX7mNRqcociBis/pb6pA4Z+f9LPYM2NJv8YSzOxO5DRt4EfheNMw8WKchIWad2
+DOUt7XN05/2Wmpg4NHH0t1qLy0kBGEiLSXUbiEuJ2mi7za3TnNwp46W2LoRQ3I5/
+BYQUu+D+kU4ZY2gn69VEGm0objvgKj3QsWanh3Lj2Ko
+-> piv-p256 zqq/iw Ap3oOVLbLeOc18E9kCcqKkuDhRqgPKNXEHVObuJZoE6Z
+DznnLFn0ONzT6tC8bkjewgqWbsJiF0XPiZXQVYwFkBY
+-> piv-p256 vRzPNw AxUF2QheGbpOvd9eQ9pin9+PCqIRfZ/AbkaWthCfKNLc
+m3WNDVUBZDtCDc2dwCD6nvIHUX+cl7wo0z5nWw2CApA
+--- VJ+FwmKfZisYidD0B9sYLDme3FVxuXJEveRF4dK+YZI
+M]O������Kf��k��GO��	�S;B���f�.^'}Hªd
�dtG��Y���	�r���mT4�(�1�Ό)�ۭ�_��)i�([a���΀Qy�7Hn
+��#��O�
\ No newline at end of file
diff --git a/secrets/paperless.env.age b/secrets/paperless.env.age
index c08c54c..9f5a643 100644
Binary files a/secrets/paperless.env.age and b/secrets/paperless.env.age differ
diff --git a/secrets/rclone-pie.conf.age b/secrets/rclone-pie.conf.age
deleted file mode 100644
index 62cf248..0000000
--- a/secrets/rclone-pie.conf.age
+++ /dev/null
@@ -1,23 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 8bHz7g 5tX4I9C2sqQ585//XBKPe/5wUGXS0II+VJpgmFD5JzE
-TFYb+9V1S70PI8zy6+TbeCE6Z5TxBtvRx/0s0cHNpmc
--> ssh-rsa kFDS0A
-Uqbac+VKWOsIJ1WslFc68Y0aNs4Qqd50f9uUY+u+VkudQwGUcKrLeYASQVN5XwUL
-zFVw/39N7AR2giA9n/LEw683IZkjdhJt02Tl/soCvRNncCIaJw0SAfqoJVeQ2N07
-gFjqE6QYmh4/5DOInRayzOvxrDucz9ji/iNMwdXCNAoyTQzKf7EiLbtd8CKwnONx
-HDSj+YXTNFygM0kkRgcH4psiqxAJ/io7iXtmWgMDMn2Sa+h51b07KPax9qiVi/wl
-zeHs5Sc0eYnu16kPg/PN67PrVliMeOg03vBVR+tELDslmkObaZ5RVL76U5sHYgV3
-lC+i6lhRe2Brq3pusidP5fbw7Wpf05YnbpL0BE6C7xPa91P80SWYlCLn2+hKBZ7z
-YddOHSssfvlf25UGFt28FiSGUjbr7k24cV2tXgRcHlY2ObU2uQ2xgzPxGaFgtfSo
-bk6wPrH9dB3iEJIpSY4u9m3PgtNEKBknjZodzrE32Qz8Ffgut5NQ4oKJoZ/lJIu5
-KB8a5bsHfzRo95w3UAK4pb3MXjMY1F29lZZ9PofEuBDg1IR9x4aTs2RVp0yruAA4
-N+V53t5yUz4J1umrit5lGuE5TNxJyJZ1Med0b1z2V/A2tstVHnhi5WQX/Lvkd4QQ
-i/2WZfKC6xwdpdMUeBEeImzyEByv0ZYcTeJg/uyXEME
--> piv-p256 zqq/iw Ar8w2iXTqd8Cp9MrNSBcx8F5R/i/LLO3+tbxcEeAaxQj
-K0fpNGKdieq5PdsUxkVbWvv4re0tbfJAvA5BLv3NXng
--> piv-p256 vRzPNw A2cvMzMyWqr3x90irJ2UbvUhubHrSrWxOv2ufZxq7Uss
-RaBcEhSGlI72W9qkM4d73tLW36I85ezA8qaMuZ4gKeU
--> )*,2-grease EO <n O26t]ur m"^s
-uS2pF4qN4V01mXD3V3z3k8fHRiXcWeLxJBJzl3NzbxVonHIhvfuF90U
---- kA9nR0Nzybv6y6TFkN9R/8QkDj7DMF6sHAHIgPQsPMk
-���:8K�
0P
=�}u�`E&�e#[�_ ,���ſ��e�hr�z@�_ؖ�n��k�n=��"Bm ��zhI
)�ju�QWC���[33��dx�����-�Ԧ�uP��[z2_)�q�gNz��95�*bX!:�#�KC}�@cg�y�9C����/��Npw�}���V���UWA��	�ߑ��;�DjJU�nW�>����D�nL�9���;73
\ No newline at end of file
diff --git a/secrets/rclone-pubsolar.conf.age b/secrets/rclone-pubsolar.conf.age
new file mode 100644
index 0000000..9fc482d
Binary files /dev/null and b/secrets/rclone-pubsolar.conf.age differ
diff --git a/secrets/restic-password.age b/secrets/restic-password.age
index 93d12da..0382235 100644
Binary files a/secrets/restic-password.age and b/secrets/restic-password.age differ
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index fdc415e..24437e5 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -76,8 +76,8 @@ in {
   "authelia-jwt-secret.age".publicKeys = pieKeys ++ baseKeys;
   "authelia-users-file.age".publicKeys = pieKeys ++ baseKeys;
 
-  "rclone-pie.conf.age".publicKeys = pieKeys ++ baseKeys;
-  "restic-password.age".publicKeys = pieKeys ++ baseKeys;
+  "rclone-pubsolar.conf.age".publicKeys = pieKeys ++ frikandelKeys ++ stroopwafelKeys ++ baseKeys;
+  "restic-password.age".publicKeys = pieKeys ++ frikandelKeys ++ stroopwafelKeys ++ baseKeys;
 
   "paperless.env.age".publicKeys = pieKeys ++ baseKeys;
 
diff --git a/secrets/u2f_keys.age b/secrets/u2f_keys.age
index 5d2e213..fcea910 100644
Binary files a/secrets/u2f_keys.age and b/secrets/u2f_keys.age differ
diff --git a/secrets/unbound_control.key.age b/secrets/unbound_control.key.age
index cca9e60..f16c502 100644
Binary files a/secrets/unbound_control.key.age and b/secrets/unbound_control.key.age differ
diff --git a/secrets/unbound_control.pem.age b/secrets/unbound_control.pem.age
index 12d7b95..278f03f 100644
Binary files a/secrets/unbound_control.pem.age and b/secrets/unbound_control.pem.age differ
diff --git a/secrets/unbound_server.key.age b/secrets/unbound_server.key.age
index 2da2097..49e8377 100644
Binary files a/secrets/unbound_server.key.age and b/secrets/unbound_server.key.age differ
diff --git a/secrets/unbound_server.pem.age b/secrets/unbound_server.pem.age
index 3bc5fb6..b81f7c7 100644
Binary files a/secrets/unbound_server.pem.age and b/secrets/unbound_server.pem.age differ
diff --git a/secrets/wg-private-biolimo.age b/secrets/wg-private-biolimo.age
index 0b4ff2b..73c77cb 100644
Binary files a/secrets/wg-private-biolimo.age and b/secrets/wg-private-biolimo.age differ
diff --git a/secrets/wg-private-chocolatebar.age b/secrets/wg-private-chocolatebar.age
index 7d7cba8..8b8cdaa 100644
--- a/secrets/wg-private-chocolatebar.age
+++ b/secrets/wg-private-chocolatebar.age
@@ -1,23 +1,21 @@
 age-encryption.org/v1
--> ssh-ed25519 2Ca8Kg NzlFOmYD1s3Xlr+u2hJ3ZNGCu/jSu2+GDUnA6/1bZm4
-16FIDRnEomQai1oz/QpXhOc/5em1JABjEq2bUVVKpm0
+-> ssh-ed25519 2Ca8Kg KqPRYOavJ0nJR6TN4ByHR6SuhYrEfiIZurQ25MWV71I
+IUk+wk4kulZED7q7yCb8QWf7pDQNT5maFY4aWYEBOp4
 -> ssh-rsa kFDS0A
-MfUTMSXl68cVHcHMdi19FjQ80VThfEXBpNPFCa5fnYI3nCGxr6Z7oWg0V6VdQ/iO
-rAtNcN9TiGu3tS+7ZPQSlN3LT1IDpFoJyKDhxS9+YyXXZKvqsat11O4lrww8+HYT
-YSRnV48i/7GtEf0sxNKc9Ymc7TPNHepnK+ndUy8jNBUAhGZak4AyStSBIXd3ElME
-NVaqDd4BN1SmlMskwj8nS0jqzeDQMPzENdRfxqZ5uy90zl3kzd8bRIuy/VP9Fv6G
-iF1fcqiywgl1XmKaEpulwa/i++Or+mNPCUjjpkS+9tY9IcUr/Jzx2SU8RBxoL9vL
-P9hKi0fdSuptyg/kvRA9PBohmSGi3w7HTTslZT0D/WLiDRu1J78N56b5Le/JiUCU
-d1J0wKP0fPFmoui/bq36Hs2NLpsYiRViIBmonhZDeZy640xW0LDuCKy7bi4mGse3
-+EFHMjr2c3fSbrCFXXghTpQCrB6DprpGTWkBwb4qY2CbWIa8BaLXXO7HSsCTYcZj
-p2CyNcmMcHAms+O8VGbvbMAlKmhqcKx0r2IjN3C9F3xda6bzM2gh2JMzg1TMJ0bL
-nL7JM+TLXqvqSRYQfmNGGXlQaxD+3bm0T6fMlJ9ELhr6167j/MgtywuIMQ0/QD8V
-DGQrZ3aHDFbrHMi2RvBat9OpGPZgySkLZNaWMv/N5xs
--> piv-p256 zqq/iw AiNZXczrI3El7fxHXmjo/D9z8Q7+FFt3WMuyY7I9M7zL
-uWSJ9EUozcwRGBtlYP3upT+I/NP/DbMF7kmEmIPAnUA
--> piv-p256 vRzPNw An+1vOJ4hXVlj3ZgsEmPzH9MerrLeOyqMVdMUC2lYXVV
-Q0/wDCLa+PkM8ondYyS88KXUueE3kyw+965cctVvDhg
--> j-grease '% W\|}+L9 b&}(
-xTvDqpIiZ2g
---- cHJMn/iiUej8LiGzNhjoH4agmXlTH8P8P4O2NoscQnk
-ɁPS{V��f�J��>�8󙅊�_ص�h܏l�鲣�s�\�%�7/ܻ�O�O︊;��,1���,	2_�����3
\ No newline at end of file
+h7Nx5XasTRgHnR/Dxoth1dzoEMUT4aR9hfz9aA6W58B583ZEx4xOYLJImAz5En0W
+HylpWVf07GiEa8Pr3lvsXOPIPofJa5HCsemnXIdFxKsfYUg2Xd5kMfvqmqUe139G
+8rQza+YZ91OjYlBD43kwlwxn6bG4uiG3u5nW77SIDW/Le6Cy13Jky90mhkTh6wyc
+FeCIkePSvlM6qU6L7JuIUAJ4MTky779+Ff3Ymu17v6By+o/SWCOWPZn9IPUK3tNe
+C9Zhaa1qSg1TxKiqfvfr5PeAms8wJuhyY0NiTFEZmFKsL4GGLsjKWFI0mOeylYeL
+mIxxajdQ0iogXYwrFQeW5XijYp2LsxG+L+ru85aeZWgrl5PBiBlLwXiIWdszV8f9
+myCbWTrKLF4SKWB8I6eaPZsvjJyTnxsJe3y/l2bCX3PrlmLvTauOF0IvLIjQz+Is
+MxZv0EOGJR1jX83zVZ/Dj627tkFqia/CPBcZtUm59FBkd6LNUSfvJuLtXzSXrEKk
+7+xzpdEar1cV0yFLitOZdY6WRwDjQmErTo8DbAja9D2UjmFEY3ffYtwSXPAw3waG
+GDgn4HpGl/znb/zFtrAaVKjuo6cWWkrn4MRNaWkR2FFsdI8Y0D/nqt7Uv1KkOhFO
+IXz962k4cnOJXri3Bf4Fqjq7X7BAebxfvA7PzwpJPVA
+-> piv-p256 zqq/iw A5JBNgUuEnHhw+n+hGMt6kmDD+nqpQ9gJoDS2/2xoWD2
+TxpXsubk0bRoA399UInJBRA8Cy5EZ02WFvoMo2GDsW0
+-> piv-p256 vRzPNw AyZIszaBx2ExXVKeCWa41IZ0gf81RMobNWuSiK87uLWW
+dHJKTqYlr07uNQPzVdvIIlQIy/stuwxgW8U74PkVHo0
+--- Y+oEs4EyDRledwkhXMHayNAzw0/mH9RjmMYdxSKF3X4
+g����J(��?p����kB6O�ǔ����S^tzٙ¢+i��X-�ZZ.Gk+c&-��>!I��_*v��P[T�4
\ No newline at end of file
diff --git a/secrets/wg-private-droppie.age b/secrets/wg-private-droppie.age
index 5d1cd82..a726b96 100644
Binary files a/secrets/wg-private-droppie.age and b/secrets/wg-private-droppie.age differ
diff --git a/secrets/wg-private-frikandel-server.age b/secrets/wg-private-frikandel-server.age
index 414dc75..325b1dc 100644
--- a/secrets/wg-private-frikandel-server.age
+++ b/secrets/wg-private-frikandel-server.age
@@ -1,24 +1,21 @@
 age-encryption.org/v1
--> ssh-ed25519 n71/yQ 5haGtuX0lE8Y/377A4juZy+6B2EKF29cQv/Vr/YYJRg
-SF/Qg5iRR+5eLOa1VA2bDaBeuIpmt8wLxsqGCjlY3hg
+-> ssh-ed25519 n71/yQ 1ZzqcLlcp/4DljbaakRPZARkhs7XcRqa78grUbloCVk
+Dox3+hZ8zGgE0Urur1/7Eq2AHbHgZ0dbJBU3ClRvuiw
 -> ssh-rsa kFDS0A
-Gc2/HAQZonZvzQxit8Zc6TubI4gJHo75S4PF/gP2/ILMK9xh6Yf5m2ixjkhFhbKk
-eh6VEzoGX5kkPm9SlmRVeAlE5ClSGEG9mqL4wcBtKhUZXXuvhaMoaJOlphZ9Lcgc
-HFi/qxyp4WE7v45L8FkmYQzfhypqPC4ef/I2bG3d4EPoR3/ciPD/fdTWnlA5vx/a
-+9Whl0RjuKhSpHzl4miA19s/p+gEjn+d6Dqaf1EPgweEswJXAKtHt1tOp6q/pl8g
-3T810aUYkbgBopIso+U0HX94VK7gvJfeIyRk64P46IMo8FHJhutxca8pxOWF3bbC
-QqhEGSsRk7MPT8iMsGMW5SlA1Xw0pDwKINR8BmUWvz2yf6NzKzoK1B0uAWHadJip
-l5MpiTbmMTBc9ghIkIvxFKuufp+5Iue8qCPtg0j/Cq1Owk9BdYXdia9H6mAYtLuA
-5w8d4G9vBSmVb5K7F9pJey8lqm4KuRpnDGXBI+HIeDAWHyhq0/isjHDZGeZ3FvWy
-2Ea3ZYim0Msf4v0vZCN/T13nGFBOuu+2ExCyV+BrsIkIygbJuiZnCargMaOUpF1v
-Ze+fnZJ880l809auvW9h8W8QFgWPojfWgfT32FIl0n2zc71rh1vvGKL0cgMRUbyA
-3A9NmNcRMJ0SqRWTyrP6RyIlmzGJqyogysO6JQ80tVU
--> piv-p256 zqq/iw Aux4+LKkxM1KXQKvCDs3QDXV2YtcB3VhGlhZQhzDwhXc
-p3bhhl8Qzb/1sl4xN21II2bQZAB7kceycgh/wWWxAkg
--> piv-p256 vRzPNw A3kJ1x2AIhPI8c50iJmRPk0d35xOXjK1h3bgz2cF9fPq
-Aoa89fyn0sajhhDEE85p5qsPobNsOQvnszrfig/LZjo
--> I~/\RCb-grease c
-YzIE557DLZ8ZoQhpjHyGBFomCTRJ1jEqoVF439fryRfDDKZ4QeyH0dksrtw9dpcr
-NAinAHlKafpv
---- C5OQ3a+DqiWJc7455+cMWnZN9pGdVLqW/lgUZT5oKOE
-�5'7Հf��yW��F������NJk
�^�!1r7��3�_��
�#��w�N�&����MyĔ���{�Kti6��flՎ���
\ No newline at end of file
+F50yUOmU4DZzuVl7LhX+hiHJUbdfXE0fsFS+J18ZNQG6tOioc+qsN6cFv1Nnz/jN
+DPR+nHxF4tIrdT9O6M2fzavP7do8Rx1L7ta3AkBviuQKVHsP3bNGeEKYv3ugmpee
+XkVrzHgRdX4Q50Ov3LMKz9T+tf7G4MFmmYpPTPfcXjXvF2DbE1BaLMJ6VwNzD0ew
+l9XVDWqV6nFPKmWwuf3FbSL56FSlDB7QFpjR7dWiVEAte99LcEKSQ81Ne3uOWmRI
+rwNBpcD/hKyXd0+S/vWNXOUCoRVyo3VO6HtM+5yKegbp6rJ2SleOSky/U4VH9MUl
+dvxDJuPfySXqHEIIevCwysdlgItq5YadEU/MnG9OyB+RWqyw1zELPJb81COZN8PK
+TSywNNw+eWiDVjGn6A/G2TDEMPNMgVU+hFW1LkLy9GKgWOl48Gw1CVnvreNr5nvg
+v4nbn8iOcYvNGqAwnY1h7fsIVqNB6bcDeiCx7q7cRkcwPJbiykH3Wgpmnqjbw2Y/
+weR2NpWen3WsWo7KWbZTDg49Uwj2n1Ic/gkmuoLgLMPecG9SNeM4ws80ACsDjzX9
+foHAd3ohnKSKpz301+XwSh1wZC0v7VIa1YSHITyAhvNsVqOSvVSTkjy+7k5bwjwC
++91HBI6JiiI4UFgk4Ag1aeJD+ghhiSJMTVv40zPZttE
+-> piv-p256 zqq/iw ApVR75uN8dFTMz3anthkbOzDK03blcSlLOEDGMnIVtAw
+AaoFv2CMZ5j7N/LGR2gM6Lihg4BcLg888FudDrF459s
+-> piv-p256 vRzPNw Axx6JO0ScxBhMABMsomkXph2YNanhxwsRFaohYVpqOm8
+b+taQI5vGtqkJTGE+2wWzXnx6DaPZG+wagzcPQfK834
+--- qN6LLCyDvrsXxBGbvGHOyaNh4Eu55raQ/IzcGY0I2/k
+���y�g�!T���rZ�eg0�^G�i��` �e��{�1�Au8��p&}��ai�7r��el8���qI�/�v��
\ No newline at end of file
diff --git a/secrets/wg-private-pie.age b/secrets/wg-private-pie.age
index 4424dcd..c47e51b 100644
--- a/secrets/wg-private-pie.age
+++ b/secrets/wg-private-pie.age
@@ -1,23 +1,21 @@
 age-encryption.org/v1
--> ssh-ed25519 8bHz7g hQ3+2wyvCmD0BmXrS2+1KXj5RMWXqs22PyFRAXCnCBU
-flOMlXJUyQp10G02JhSxwLiXwtjWJj7xIgqBS6mjy0o
+-> ssh-ed25519 8bHz7g aGiz8pOzxBtb+M3FU3e6sPdDft8WBOp/Dv2LVDivVUU
+SCMT7KznqX8zS7ulSqsxKURSH9C1AhWBcSTwwEHevyo
 -> ssh-rsa kFDS0A
-bN5tM+EjvvJ8gjP2j1ZIjT1Qe9CpP1krr4IKl9Q5sNG+VOBythswej4QwSWfQtde
-GaVcE71SegdJD5S0Vqsa18d5HDyjktQVQlqIzm2/Wav/xKkoeCwbZE+53Qc6C07g
-AMFoZ11EFI1EXM4x/EvNCHfLDPH4XMq5ZYbR1Vrj2KKorOHCqLxoOpzdp4jd8jIV
-4xuynGhiaxnFJcKUqND7tC/B/eXszL8bYB4LRtYWur6aA4lZ8dFX8SCpTfCR+lX2
-DULgeIfK8tsGpf2TUILYY8AMiE8hmfLk3CE+UiP5iogsMWSXI9h+OVtTiXUrCk9K
-QITsDwQUkoXUVsLNe6sqInGs6KXm0IC7qqMR3qmxxKTczKvv+FL+8PG2j5ueMRcP
-9LkvkBtcT3gXjGwOV+SSx4VGdtCHyGp35uufjAq8KqlQCY1VlaeF5qaZCsXrTvfq
-MAXMHAniKaTCux2yGmjzy0fR8SOU+r88ZEZtryXqObtEytKhfCJhxjDMNWjXpRtV
-LkX8AM0E/pHRhUvf5ao+M2DGPIEjnyap81eQhPH42cBoXPmfKedrOFH5es7vbQfe
-7GXsbxzwgnQJTEuGsxXiGWaZsKbrcxTLMlzsihLzwW7gYVs7PoiCmxpRXB4bwInY
-2JEhkDaTh3ukTHpK4+6P7pruDgGTbj4jfjXbgK0LHU0
--> piv-p256 zqq/iw Aos+V9MNMZzZozEG4GRTXXquxxmLxBKmYHlEWIXj3hgZ
-oi5oL8Ngboo+XSaDqZinksU0lqNNMJMhed0MxKB0Jv8
--> piv-p256 vRzPNw A5dryJIhNeRvGjvS04IRcqnFCz2qlVFHQlLPea9xiq+y
-/HrfB+Qv9XzJnSDi0GcPU0NNZqfqg97iM39tKvoVaZU
--> Mp-grease ]R9$
-T/QsltGx
---- HF+ndHqijKpMFdEZrBCQwWjJLkYq4ZqWfT5GITaxf38
-���_�x��]qJ��nE���ԩ��
�����'KW��?��vyT5�Le �w�\'���Ql+��x�LI�>P
\ No newline at end of file
+Vzd2ZSxjupUL7W0rZAZypoUKWh0yfeYuBUiYdukHGfcSS9Cv7XORhudtMCu7fLMv
+/qWvh1/8+KiZlcLFPz9J0DIH+La6Xy+RGXQ/wDgZpii4GRnm0LBb0Ssc7GSv3GEJ
+SL49nEcHC/sLZQBYAEp7l3m74fzxG0jPJ9UMIsdOWGcYP6a8aLsbEkqxffiiwWlb
+JkGBFf4sM9l/H5eT9TBZFw03XSEvHiimbLcGMKbSrWcDOt4t3CWQAx1e61MdhFAA
+tcIFiR4R9OYM1FF+1pS2fmGvI8iaYq+y/IIoAL4uHIx4KzrjJag/7/x4M7knZTwk
+Q8dYWCZv+14AZGOfgh0uGpJ91dCDNcis897DtLWxDyHh3kc5LFzS3DmI8QG9XBi+
+wyzPGpXiSJaugZjZyXc/5A8c7c3mB37IxAr+gFmFE6tiqDPZ/DocwsqzXYYwsyd0
+lmDY6d88VEzJBWKSpQKLkqceRw7U0KVWwSCzZP3LcubIJDmVbzPQpu4xIFqfjtC8
+rAWTmd30G0DeODMyTsJiaZFFpqIu8/97VtAvtlUj48oKaeR/y/HKUQhPeHK/8u+G
+KrjBDiab0XaUQj8K8CdG4CJeIEHN62AQ1M1ubrCBbWfwq0vzf5tpJXJGxoeNVapS
+lmUbJgn7Xi8EQTnr3FyIsp5Rk52JvQXPSHvm8/IRSN4
+-> piv-p256 zqq/iw Ayp1jpSffXbD5Woja20rp9sZxjS7+q/MXDQmiEZ79uZH
+59xzWXZjE1Ju1JArOqu5KD5txs8PN77ngdtQbF6rnVE
+-> piv-p256 vRzPNw A8PLyc68WaLeK0yCkNnBZc1pjavfZO7TttcBFD1QkURO
+1Wn8e8EvRc3NVoIPgNK9qyUL4NdTOQ7H8Epz+mHwzPQ
+--- Zuf0VM5ccIhpLuGT/m+izjDEx7e4aYYPxoxUbvWVNKM
+�T=� 2�1�˳���X�q@��r����-n�����Q��L�o6�n\�ra$��X����Z������5
\ No newline at end of file
diff --git a/secrets/wg-private-stroopwafel.age b/secrets/wg-private-stroopwafel.age
index 66eb238..b342bc4 100644
--- a/secrets/wg-private-stroopwafel.age
+++ b/secrets/wg-private-stroopwafel.age
@@ -1,25 +1,21 @@
 age-encryption.org/v1
--> ssh-ed25519 b0WFDg i41DRugywwKhguvvzKBwHiy2g8MWhWkv0wifid8hcVo
-iVniMGTex3MQFp+lSxxDn/2IMx587tENmXQv2lcH2AM
+-> ssh-ed25519 b0WFDg 6B+2LUNbDyyo+8rh/BEDGZYEG1LBNM3BNHkTv3HrIhQ
+3C85aBuGLxwkKTxaoGQwH/d6G1CxjXrxjs0qcXobYp8
 -> ssh-rsa kFDS0A
-WcaL8c1+HAU8Fjd0QPdcWvGbAVTUgkxH+++5SHkrGYVOW7tsdaX7e0nVTKuIWa5s
-hPPEqz+xg7XwVJtbmqV7CZ1r/gRXshC1epTER9slKiU+o9XdMl7mVOpWzROQbI9M
-6ZpSbWUHenmZ4v5RZFswho3EkqwFJJQVAaD/3BQVOY0BYSaC5mhaTpsD5/s/V+1y
-/C6sSrJ5STGc1ZQ5rnvUId2qAZCrginNWmh0B9QpW0hJugKL6xOkCdJGiFLvQvFW
-vU5IO+GDl/B+bsIPDmzRqs3UUuErs4rXWLasV/9zHXdUpoeFXTKCoLPXlhK3qVQb
-25xmedaS+9s9tTd4Lb4bI5kHvnINAZa67u5VL0o0azHLy80pCJeOSLzYaj4E83BW
-tQMcPuCG7ViWn1+BEnB+1c5GLBFAV2s+krJz2LaayZa4g6o5PlSmC0wU4r8Nw7oG
-9MWay2CPbbfM8eu+JKQ0x1GbZHUmWU0xlRWuaQzc0yYybGVBDaaaosJztQnIOzuH
-M+EzzM6PPb6S1dpYIOhnYg8Bpx4TNmJ7NJk0d93SYd+bcYgmFqU/8P23fn2QCwow
-+XcGarJiDRbqqs/Yo8rSb31ZY3MknJjaGUJl4YaHqqTszpGBtg93vkTecXHbPpZL
-D0nim5SwvwIPLSKQLb99AJrmRlZpS9APxLv2esODO7c
--> piv-p256 zqq/iw Aq7821c9GsIVELFO0/Yi9IT5Bp1prVGZYxZRrVEc5Tri
-uA9BhJIwHOJIDH0DuVpz2sY0i2k67puvoC4bApO0uGI
--> piv-p256 vRzPNw AtnEI2530dZZBQMrfTiCWzhwsGrl5JMEX0eqbXnHBQ06
-T16WNIdFO3T3V6HLHFuNdgWDwvtc5Y8CB/LubVg8oTY
--> 5dkO-grease 9.lBvvN 4<)myIo v\)S
-Nw8ymlLA2sTovBJdp9P56UguFS/TNjqJBNfJpkLQI190joCiTCLVbWuM5km0ZbJ5
-0W4ATKVgRHVx1dLVjgQW
---- GEJeyoaq6XJ9/HBcAstcHTuhj6JiyB7QAV9IwJqfRCo
-�Ә8���{HV�QB?3Apq��6t�7o!9S����
-�7�C)@	�tatc_�pj�o�����:a����Ƈse��
\ No newline at end of file
+Lt6nLmRv/yQRgM+fR6uYumr+clcWqVvC33oeUSbUHd/zmpjdq5iCw/i5W3dKeb+K
+d9hZf1FSJvpziHo77zA8AafqP63/p3rq5J3EAaZGbEh6rUXRoHEL2Jdz5r2oEThx
+0SDtxITyeRAd1G/tD4K7qzE12Jc+jn6/deFqlzdsJpCgKNph60WGOI7CfaVvauYE
+200GfZSTPFj5B6dksZNnJ3u/i6sGPQ6mPcVGTZsyqB82foK1Y+qKMsEdauCm8JoT
+zHf+Z5OwQCcf3C1AVWxIc1Lo6J8zaBANHsaMr4ELsW00dgGGHCmnzOLE5/0vXIK3
+IxiDRifchNpe7ZQp00md3+r8iGDnu0wu0yGKyNy7oee5jAnChph2WVNAUgaagR1q
+xQwNdLD+wr6Ahp45iVVmXShkFOV0bWf2ZIV0X7qqPnNPkTcAaK3J8RIJry3pI4vU
+2CBVMY65SYvZs8ZNe50LCMXpTkUX0gFmYCxUqJvkSv6WfodHMa8wmWsJgauevqPT
+WhjaK1P0/bihsCsrTFL83x5b/MBhz/z5qN0MwLMH1wFhNX55ufBFsKtf1gNTJeNN
+NEuoXg4XqzHR6HPtx1x3fb7SCPhExiBWYyLJ1ljU/gmJtFZ8+uzwN49fF7BxMisZ
+iMbH0/WpTl+pfrx2y9rBpjKhtWEkjaJBKa5XYxfRR4E
+-> piv-p256 zqq/iw A82lS6ZoidY7UK+MOuvSCf4v0KsVsIkZU3COt4AjIs0Z
+U5dBmQxi958GjT+gVl3chL14hHw85x0PkMUC1c0DWHQ
+-> piv-p256 vRzPNw AqQwGkkej9btvyNGr/AHJ73JsHv/LADJOnSkidqus5fi
+TT+zfq78s/oETcxTfBm1UqP7htE40YUszNttkDLWutY
+--- AhBrxPkF8/2hceIKKldz7z3zlTnwkjluG9QPdZgiy0s
+"�����R
>t��5��c�,�e�"����c��ξ&�^VMpT4�p��<p=E��d�&t�p��oZj
^�J�
<9�
\ No newline at end of file
diff --git a/secrets/wg-pub-solar-stroopwafel.age b/secrets/wg-pub-solar-stroopwafel.age
index 934cbc4..8829caf 100644
--- a/secrets/wg-pub-solar-stroopwafel.age
+++ b/secrets/wg-pub-solar-stroopwafel.age
@@ -1,24 +1,21 @@
 age-encryption.org/v1
--> ssh-ed25519 b0WFDg FVT9AEwFAJ05+ximaSsEIdfW/HD7ZvUUFwwB26GDNQM
-sWo3Cewxl6NFyj6+I5fFRv675ehncRsAA+oLNzO2jNs
+-> ssh-ed25519 b0WFDg 9ZblEjMNT1+J6Idew5UR7AC/WzkSN8aiq8b1h7p30WM
+gpnjijxxitljE9U8Ecu3X0XCRQVI2oFA68N03Ngkz5M
 -> ssh-rsa kFDS0A
-gJiz5L1u7Y5UPeH1dcjkHOhMJ38taEuOt9tkTc+BRqjsGN50rW/gtJuJyBMwI3v5
-odxVJcWgp6uZMMJdTN6L7e7YRcDbZUbbKYcnQbuAE3mb1y0WrZLRbLfWS7eNTB3d
-CRNeqfVn7Tg2e/r2kwLWmZb2HdMn0t6Yv1adPkQ1kkmkrzHPfpgfxdyxZ1WzEOnV
-g7WgxYw0mmLpnN2n1PPSSvAn/v8u4sj+7vMszoRIEgyVSRwDxKGR3qo2sKchSeUD
-yZX56a6AJgHHBh7wUjURVd90HBzm4dKbC8zzir0ZygWGVrNf2ybnLPj1c7Hl+zlW
-up6IwIGplWDkQY/fix1wVg+KBtphLkTVaW/3ZuyOu2q2JC/Vnprz1BuPpkWUC9lB
-9RW5NjN8P03h1rPg7USPnN2Pyrc63pBG55fL/Xaohk8eedD65kpxuH0afUv7422t
-95iG0SbEwAokJhTXkSDN8zMMxfn9c/+rJSUdQ7Qc5WyrvDePZw1zu104JV9Jlq9s
-ArtR437UL2GZu1xs6tXFsfbxJdI/YfmlgjwofHdmukuOzFZPqUtBmCsOI3b22JaV
-fYhlYHI0nQLbujSP31sm81xSBaIz6kH6yniospmLFIa3niXay9MnlEAM5ljUHBk/
-GQtSQPt75y45FgkghYhDG+/av0CbgEOypbYrUvKuXqc
--> piv-p256 zqq/iw A7USudAooh1b3G9cLZoudZ8WuBJusE3gTmVU/3AaOoBh
-O4OD1N2MQezfJI1m5kndsu0U7sG19EQHAL+mOSLK+Wc
--> piv-p256 vRzPNw Akjk82+BfO5tApOXVUCYwgXJer+y2VrUkmdoQRUSNHoR
-ULJojv+NuRsw+ygQ1+8Kr8oNZ+0tioVW0aHvf7siUlA
--> !z&b-grease gi.# |_t^z\0J ),Y}>RlK ,qOur6S^
-IImLm/0FMvQ1SnrbZXCdTT6LY5sm1UeKFNjMOGD5JXxSWaZYJ/FujzzDLAwNqDJN
-PFnYFGHGv3TqxEDYpy9R+OAROsIgQeI
---- eYDSPRJJ8A2xQVO+ttl1doPz738sD2qo+hrE4S+KwwU
-c{4O��ʫ���D��x�T�F�_�����TC��'��o-�KR��_�Jǿ]o��<''%3��9HF�Ug�9
\ No newline at end of file
+DMXk5DS3VqI8nsBFhFGSe6LtHVXQ+zFHSLLJGpza7/o0QBfPyo88pyWkC51s/3Y/
+AwC/3PqDSGKmioMtN9a+GLHRgA3WRAfWHv2+OENjpA48yFehNQdPcI1qT5h5Fp/x
+r8mMkoomFGdBF1kbwlS3snTDbb9ooiFC80qpClnb7Wk8yfEiTTLep6CKhhqIYkxE
+LIwt4BJW66WoZvPiL8OJN1KtB1tsStfJOM+Id06wC96nj5tgbuGxJ4WShg2qRI1k
+41bqD1aWfHdIZrodPT7j+qWSd5mfDzGPHoL3HKZyIaj6Km+zK5GBd6rcNGU6kU5w
+twuhQe7qA13K6m/RN5qLxbRFWkmty0xrwrUfVji/O22fOAjLR+AZg6Gf9nPEnD6i
+225KjDHIjxEvafqA8NKb+zWxhI6cusArLCpQff/LbfXlBJSnq83aM3P34sNLj+CS
+jk0WBfSla1sABdn2wVeD4H9kyGP+oz/Tc2z73rcBd5Z+/Ht/WmTfkoi7PyLO7tXy
+PWK1kMwuJqp8HLuh1pIj7f/oaCtUsWyEFbCPluVXPRdHrj0e/8w+uzowZqKuKQEh
+BzQ1gNgYOXnkHvLjumk9eXqp9nudsnuYh+sQCdf8k9ST/RIipSmcWG1kR5W+Nbqp
+RTfeMVEd96USP9GLxUZMTKzsRXSxW1FLrtvwOsQq4VA
+-> piv-p256 zqq/iw AyHgcwiPfWaKC7gMxyYNe4BylCmARb5rsPdm0tPxpimN
+vB4SiMs4zrr7jNkrIkG4NQQMJL0LzlfbXJpETEf9i8c
+-> piv-p256 vRzPNw A3r2qGeF9PltP03ZEUYF2AnT/e3S7PSzxCYbIgzxK/az
+p/N++jYGbHSRcYa3EHWzDIIefF43O5wCjtQ8c+ON3E4
+--- SjXGcYahr22EeICepFivwQ97D1dpeTKv19ypXbFE/mc
+e�
�龸��K^�s&RX{7F����b�fG%�|�4Ƌ��`rY�k�R�OL��p�J�*s1�Kr��V�!�i$�
\ No newline at end of file
diff --git a/secrets/wg-tunnel-droppie.age b/secrets/wg-tunnel-droppie.age
index 04e1d78..9b9033f 100644
Binary files a/secrets/wg-tunnel-droppie.age and b/secrets/wg-tunnel-droppie.age differ
diff --git a/secrets/wg-tunnel-stroopwafel.age b/secrets/wg-tunnel-stroopwafel.age
index 77b78b5..487bab2 100644
Binary files a/secrets/wg-tunnel-stroopwafel.age and b/secrets/wg-tunnel-stroopwafel.age differ
diff --git a/users/b12f/email.nix b/users/b12f/email.nix
index 74b0b85..db532f5 100644
--- a/users/b12f/email.nix
+++ b/users/b12f/email.nix
@@ -10,6 +10,7 @@ with lib; let
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
   configHome = xdg.configHome;
   cacheHome = xdg.cacheHome;
+  maildirBasePath = "/home/${psCfg.user.name}/Mail";
 
   generateMailAccount = args@{ address, ... }: rec {
     inherit address;
@@ -83,7 +84,7 @@ in {
     };
 
     accounts.email = {
-      maildirBasePath = "/home/${psCfg.user.name}/Mail";
+      inherit maildirBasePath;
 
       accounts = with flake.self.lib; lib.lists.foldr (item: set: (set // { "${item.address}" = generateMailAccount item; })) {} [
         {
@@ -221,4 +222,25 @@ in {
       };
     };
   };
+
+  age.secrets."rclone-pubsolar.conf" = {
+    file = "${flake.self}/secrets/rclone-pubsolar.conf.age";
+    mode = "400";
+  };
+
+  age.secrets."restic-password" = {
+    file = "${flake.self}/secrets/restic-password.age";
+    mode = "400";
+  };
+
+  services.restic.backups = {
+    email = {
+      paths = [ maildirBasePath ];
+      initialize = true;
+      passwordFile = config.age.secrets."restic-password".path;
+      # See https://www.hosting.de/blog/verschluesselte-backups-mit-rclone-und-restic-in-nextcloud/
+      repository = "rclone:cloud.pub.solar:/backups/Mail";
+      rcloneConfigFile = config.age.secrets."rclone-pubsolar.conf".path;
+    };
+  };
 }