diff --git a/machines/lasting-integrity/default.nix b/machines/lasting-integrity/default.nix
index cbf2d8db..8188bc43 100644
--- a/machines/lasting-integrity/default.nix
+++ b/machines/lasting-integrity/default.nix
@@ -41,40 +41,5 @@
         rootPool = "zroot";
       };
     };
-    services = {
-      matrix.enable = true;
-      nginx.hosts = [
-        {
-          fqdn = "vanpetegem.me";
-          options = {
-            locations = {
-              "/_matrix" = {
-                proxyPass = "http://127.0.0.1:8448";
-                extraConfig = ''
-                  proxy_read_timeout 600;
-                  client_max_body_size 10M;
-                  proxy_set_header X-Forwarded-Ssl on;
-                '';
-              };
-              "/.well-known/matrix" = {
-                root = pkgs.runCommand "well-known-matrix" { } ''
-                  mkdir -p $out/.well-known/matrix
-                  echo '{"m.server":"matrix.vanpetegem.me:443"}' > $out/.well-known/matrix/server
-                  echo '{"m.homeserver":{"base_url":"https://matrix.vanpetegem.me"}}' > $out/.well-known/matrix/client
-                '';
-                extraConfig = ''
-                  default_type application/json;
-                  add_header 'access-control-allow-origin' '*' always;
-                  add_header 'access-control-allow-methods' 'GET, HEAD, POST, PUT, DELETE, OPTIONS' always;
-                  add_header 'access-control-allow-headers' 'X-Requested-With, Content-Type, Authorization, Date' always;
-                '';
-                priority = 1;
-              };
-              "/".return = "307 https://www.vanpetegem.me$request_uri";
-            };
-          };
-        }
-      ];
-    };
   };
 }
diff --git a/machines/marabethia/default.nix b/machines/marabethia/default.nix
index 19d31d5b..3a935f59 100644
--- a/machines/marabethia/default.nix
+++ b/machines/marabethia/default.nix
@@ -84,6 +84,7 @@
     services = {
       git.enable = true;
       mail.enable = true;
+      matrix.enable = true;
       nextcloud.enable = true;
       nginx.hosts = [
         {
@@ -109,6 +110,36 @@
           options.locations."/".return = "307 https://www.vanpetegem.be$request_uri";
         }
         { fqdn = "www.vanpetegem.be"; }
+        {
+          fqdn = "vanpetegem.me";
+          options = {
+            locations = {
+              "/_matrix" = {
+                proxyPass = "http://127.0.0.1:8448";
+                extraConfig = ''
+                  proxy_read_timeout 600;
+                  client_max_body_size 10M;
+                  proxy_set_header X-Forwarded-Ssl on;
+                '';
+              };
+              "/.well-known/matrix" = {
+                root = pkgs.runCommand "well-known-matrix" { } ''
+                  mkdir -p $out/.well-known/matrix
+                  echo '{"m.server":"matrix.vanpetegem.me:443"}' > $out/.well-known/matrix/server
+                  echo '{"m.homeserver":{"base_url":"https://matrix.vanpetegem.me"}}' > $out/.well-known/matrix/client
+                '';
+                extraConfig = ''
+                  default_type application/json;
+                  add_header 'access-control-allow-origin' '*' always;
+                  add_header 'access-control-allow-methods' 'GET, HEAD, POST, PUT, DELETE, OPTIONS' always;
+                  add_header 'access-control-allow-headers' 'X-Requested-With, Content-Type, Authorization, Date' always;
+                '';
+                priority = 1;
+              };
+              "/".return = "307 https://www.vanpetegem.me$request_uri";
+            };
+          };
+        }
         { fqdn = "www.vanpetegem.me"; }
       ];
     };
diff --git a/machines/marabethia/hardware.nix b/machines/marabethia/hardware.nix
index bc325898..f7fe8faf 100644
--- a/machines/marabethia/hardware.nix
+++ b/machines/marabethia/hardware.nix
@@ -69,6 +69,10 @@
       device = "zroot/safe/services/mail";
       fsType = "zfs";
     };
+    "/var/lib/matrix-synapse" = {
+      device = "zroot/safe/services/matrix-synapse";
+      fsType = "zfs";
+    };
     "/var/lib/nextcloud" = {
       device = "zroot/safe/services/nextcloud";
       fsType = "zfs";
diff --git a/modules/nixos/services/matrix/default.nix b/modules/nixos/services/matrix/default.nix
index 97f768cf..ccb8db51 100644
--- a/modules/nixos/services/matrix/default.nix
+++ b/modules/nixos/services/matrix/default.nix
@@ -7,7 +7,6 @@
   };
 
   config = lib.mkIf config.chvp.services.matrix.enable {
-    chvp.base.zfs.systemLinks = [{ path = "/var/lib/matrix-hookshot"; type = "data"; }];
     chvp.services.nginx.hosts = [
       {
         fqdn = "matrix.vanpetegem.me";
@@ -68,22 +67,22 @@
         extraConfigFiles = [
           config.age.secrets."files/services/matrix-synapse/config.yml".path
         ];
-        dataDir = "${config.chvp.dataPrefix}/var/lib/matrix-synapse";
+        dataDir = "/var/lib/matrix-synapse";
       };
       postgresql = {
         enable = true;
         ensureDatabases = [
           "matrix-synapse"
-          "matrix_appservice_slack"
-          "mautrix_whatsapp"
+          "matrix-appservice-slack"
+          "mautrix-whatsapp"
         ];
         ensureUsers = [
           {
-            name = "matrix_appservice_slack";
+            name = "matrix-appservice-slack";
             ensureDBOwnership = true;
           }
           {
-            name = "mautrix_whatsapp";
+            name = "mautrix-whatsapp";
             ensureDBOwnership = true;
           }
           {
@@ -102,8 +101,8 @@
         requires = [ "postgresql.service" "matrix-synapse.service" ];
         script = "${pkgs.matrix-appservice-slack}/bin/matrix-appservice-slack --config ${config.age.secrets."files/services/matrix-appservice-slack/config.yml".path} --file ${config.age.secrets."files/services/matrix-appservice-slack/registration.yml".path}";
         serviceConfig = {
-          User = "matrix_appservice_slack";
-          Group = "matrix_appservice_slack";
+          User = "matrix-appservice-slack";
+          Group = "matrix-appservice-slack";
         };
       };
       matrix-synapse = {
@@ -116,8 +115,8 @@
         requires = [ "postgresql.service" "matrix-synapse.service" ];
         script = "${pkgs.mautrix-whatsapp}/bin/mautrix-whatsapp --config ${config.age.secrets."files/services/mautrix-whatsapp/config.yml".path}";
         serviceConfig = {
-          User = "mautrix_whatsapp";
-          Group = "mautrix_whatsapp";
+          User = "mautrix-whatsapp";
+          Group = "mautrix-whatsapp";
         };
       };
       matrix-hookshot = {
@@ -127,8 +126,8 @@
         requires = [ "matrix-synapse.service" ];
         script = "${pkgs.matrix-hookshot}/bin/matrix-hookshot ${config.age.secrets."files/services/matrix-hookshot/config.yml".path} ${config.age.secrets."files/services/matrix-hookshot/registration.yml".path}";
         serviceConfig = {
-          User = "matrix_hookshot";
-          Group = "matrix_hookshot";
+          User = "matrix-hookshot";
+          Group = "matrix-hookshot";
           WorkingDirectory = "/var/lib/matrix-hookshot";
         };
       };
@@ -136,64 +135,60 @@
 
     users = {
       users = {
-        matrix_appservice_slack = {
-          uid = 998;
-          group = "matrix_appservice_slack";
+        matrix-appservice-slack = {
+          group = "matrix-appservice-slack";
+          home = "/var/lib/matrix-appservice-slack";
+          createHome = true;
           isSystemUser = true;
         };
-        mautrix_whatsapp = {
-          uid = 997;
-          group = "mautrix_whatsapp";
+        mautrix-whatsapp = {
+          group = "mautrix-whatsapp";
+          home = "/var/lib/mautrix-whatsapp";
+          createHome = true;
           isSystemUser = true;
         };
-        matrix_hookshot = {
-          uid = 979;
-          group = "matrix_hookshot";
+        matrix-hookshot = {
+          group = "matrix-hookshot";
           home = "/var/lib/matrix-hookshot";
+          createHome = true;
           isSystemUser = true;
         };
       };
       groups = {
-        matrix_appservice_slack = {
-          gid = 998;
-        };
-        mautrix_whatsapp = {
-          gid = 997;
-        };
-        matrix_hookshot = {
-          gid = 979;
-        };
+        matrix-appservice-slack = {};
+        matrix-hookshot = {};
+        mautrix-whatsapp = {};
       };
     };
 
     age.secrets."files/services/matrix-appservice-slack/config.yml" = {
       file = ../../../../secrets/files/services/matrix-appservice-slack/config.yml.age;
-      owner = "matrix_appservice_slack";
+      owner = "matrix-appservice-slack";
     };
     age.secrets."files/services/matrix-appservice-slack/registration.yml" = {
       file = ../../../../secrets/files/services/matrix-appservice-slack/registration.yml.age;
-      owner = "matrix_appservice_slack";
+      owner = "matrix-appservice-slack";
     };
     age.secrets."files/services/matrix-hookshot/config.yml" = {
       file = ../../../../secrets/files/services/matrix-hookshot/config.yml.age;
-      owner = "matrix_hookshot";
+      owner = "matrix-hookshot";
     };
     age.secrets."files/services/matrix-hookshot/registration.yml" = {
       file = ../../../../secrets/files/services/matrix-hookshot/registration.yml.age;
-      owner = "matrix_hookshot";
+      owner = "matrix-hookshot";
     };
     age.secrets."files/services/matrix-hookshot/passkey.pem" = {
       path = "/var/lib/matrix-hookshot/passkey.pem";
       file = ../../../../secrets/files/services/matrix-hookshot/passkey.pem.age;
-      owner = "matrix_hookshot";
+      owner = "matrix-hookshot";
     };
     age.secrets."files/services/mautrix-whatsapp/config.yml" = {
       file = ../../../../secrets/files/services/mautrix-whatsapp/config.yml.age;
-      owner = "mautrix_whatsapp";
+      owner = "mautrix-whatsapp";
     };
     age.secrets."files/services/mautrix-whatsapp/registration.yml" = {
       file = ../../../../secrets/files/services/mautrix-whatsapp/registration.yml.age;
-      owner = "mautrix_whatsapp";
+      owner = "mautrix-whatsapp";
     };
     age.secrets."files/services/matrix-synapse/config.yml" = {
       file = ../../../../secrets/files/services/matrix-synapse/config.yml.age;
diff --git a/secrets.nix b/secrets.nix
index 60376c29..b3a8e9e7 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -82,14 +82,14 @@ in
 
   "secrets/files/programs/transmission/config.json.age".publicKeys = [ urithiru ] ++ users;
 
-  "secrets/files/services/matrix-appservice-slack/config.yml.age".publicKeys = [ lasting-integrity ] ++ users;
-  "secrets/files/services/matrix-appservice-slack/registration.yml.age".publicKeys = [ lasting-integrity ] ++ users;
-  "secrets/files/services/matrix-hookshot/config.yml.age".publicKeys = [ lasting-integrity ] ++ users;
-  "secrets/files/services/matrix-hookshot/passkey.pem.age".publicKeys = [ lasting-integrity ] ++ users;
-  "secrets/files/services/matrix-hookshot/registration.yml.age".publicKeys = [ lasting-integrity ] ++ users;
-  "secrets/files/services/matrix-synapse/config.yml.age".publicKeys = [ lasting-integrity ] ++ users;
-  "secrets/files/services/mautrix-whatsapp/config.yml.age".publicKeys = [ lasting-integrity ] ++ users;
-  "secrets/files/services/mautrix-whatsapp/registration.yml.age".publicKeys = [ lasting-integrity ] ++ users;
+  "secrets/files/services/matrix-appservice-slack/config.yml.age".publicKeys = [ marabethia ] ++ users;
+  "secrets/files/services/matrix-appservice-slack/registration.yml.age".publicKeys = [ marabethia ] ++ users;
+  "secrets/files/services/matrix-hookshot/config.yml.age".publicKeys = [ marabethia ] ++ users;
+  "secrets/files/services/matrix-hookshot/passkey.pem.age".publicKeys = [ marabethia ] ++ users;
+  "secrets/files/services/matrix-hookshot/registration.yml.age".publicKeys = [ marabethia ] ++ users;
+  "secrets/files/services/matrix-synapse/config.yml.age".publicKeys = [ marabethia ] ++ users;
+  "secrets/files/services/mautrix-whatsapp/config.yml.age".publicKeys = [ marabethia ] ++ users;
+  "secrets/files/services/mautrix-whatsapp/registration.yml.age".publicKeys = [ marabethia ] ++ users;
 
   "secrets/files/wireguard/elendel.privkey.age".publicKeys = [ elendel ] ++ users;
   "secrets/files/wireguard/kholinar.privkey.age".publicKeys = [ kholinar ] ++ users;
diff --git a/secrets/authorized_keys/charlotte.age b/secrets/authorized_keys/charlotte.age
index 6d44fedc..0eaccead 100644
Binary files a/secrets/authorized_keys/charlotte.age and b/secrets/authorized_keys/charlotte.age differ
diff --git a/secrets/authorized_keys/root.age b/secrets/authorized_keys/root.age
index 3e6bde8a..35679dfb 100644
Binary files a/secrets/authorized_keys/root.age and b/secrets/authorized_keys/root.age differ
diff --git a/secrets/data-access/authorized_keys.age b/secrets/data-access/authorized_keys.age
index ee346670..d6f2ccb8 100644
Binary files a/secrets/data-access/authorized_keys.age and b/secrets/data-access/authorized_keys.age differ
diff --git a/secrets/data-access/create_torrent.age b/secrets/data-access/create_torrent.age
index aea1929f..895377d2 100644
Binary files a/secrets/data-access/create_torrent.age and b/secrets/data-access/create_torrent.age differ
diff --git a/secrets/data-access/password_file.age b/secrets/data-access/password_file.age
index bb8425b4..49d60103 100644
Binary files a/secrets/data-access/password_file.age and b/secrets/data-access/password_file.age differ
diff --git a/secrets/data-access/readonly_authorized_keys.age b/secrets/data-access/readonly_authorized_keys.age
index 52f0d584..e965c55b 100644
Binary files a/secrets/data-access/readonly_authorized_keys.age and b/secrets/data-access/readonly_authorized_keys.age differ
diff --git a/secrets/data-access/readonly_password_file.age b/secrets/data-access/readonly_password_file.age
index 123211c1..37f224db 100644
Binary files a/secrets/data-access/readonly_password_file.age and b/secrets/data-access/readonly_password_file.age differ
diff --git a/secrets/data-access/ssh_host_ed25519_key.age b/secrets/data-access/ssh_host_ed25519_key.age
index fbcfb5a6..234eb044 100644
Binary files a/secrets/data-access/ssh_host_ed25519_key.age and b/secrets/data-access/ssh_host_ed25519_key.age differ
diff --git a/secrets/data-access/ssh_host_ed25519_key.pub.age b/secrets/data-access/ssh_host_ed25519_key.pub.age
index 91f4df15..735dceec 100644
--- a/secrets/data-access/ssh_host_ed25519_key.pub.age
+++ b/secrets/data-access/ssh_host_ed25519_key.pub.age
@@ -1,9 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 9PfEBQ DuGKjFJTz+zA+GFlXxCAmNwEMr4pNhnDIZDuSidmAmk
-50KIcbkpWN5dX9P/1w8bs5gvkv+QPeG+xI2Lu2qxLb8
--> ssh-ed25519 s9rb8g 12BF+ksyVAkI2998KvCMOsN5RLV6ALcJkZ1KDoidKBg
-aK2mSAncUgx5etUu6egXX+lmQ1HdwVtXaYb4qihvVNE
--> ssh-ed25519 +xxExQ biNVcVSzq12Io25Gh0e1biUTVuEhdvYdKaOgb+RS/Ao
-AL1g9W2m6VQE1iZ5MvkLRFWZ0Z8NsvDe98NHa3ldy5M
---- kcqphbQTK8Fkgi7iIepLm01yA9bZxYrz1WMtEysXfWY
-3�T�*�.;;�%��kiA�
�@o/C�V�\Ůƈ|��5c2�̗�%/�W���	.X$
=�P��@��ѹt�2�_;�CQ�%���ӎ�~���ŏ��y�ڊ�ғ�Pd�Ƨ��“�jC��M-
\ No newline at end of file
+-> ssh-ed25519 9PfEBQ Hp2VY/yM9FlfSwG1UUr6P6QHfWDDnbS7A+HxcNuW7E8
+MpZeO8G7jrS/Z+XptAuQmzIu4TqrEr2GBWJZLDaqmPw
+-> ssh-ed25519 s9rb8g bGHNWFRz6ekRZinXKeM/ZMiae2GRFKvEi/quPEaeLTs
+QM/S/iKSGeQcntYRWhMwQUCi/d78u6xpfw5S+aUn0HM
+-> ssh-ed25519 +xxExQ SgNgk/ODOcjUMq4ZP6v9Szzg08V9oT1NxIyhZSWQrUM
+x0PgrOuQxcOqbypDDFFK8gn0wZQT74mJvO5cDaETjMs
+--- x7L9l4KNULBsVYpsKEpdXD10Mb++/WHDjOXzuGCOqR8
+fњ)0ZT�}�SX@�������H<4����7�P;��M�?KP�ٗ7���P|b� ��	�+*<e�*��U�
��-��>����
+������@6�=����g�{�
�S~�.�w��h1O}p�	5
+[�x��
\ No newline at end of file
diff --git a/secrets/data-access/ssh_host_rsa_key.age b/secrets/data-access/ssh_host_rsa_key.age
index 5fea08f8..f473f9aa 100644
Binary files a/secrets/data-access/ssh_host_rsa_key.age and b/secrets/data-access/ssh_host_rsa_key.age differ
diff --git a/secrets/data-access/ssh_host_rsa_key.pub.age b/secrets/data-access/ssh_host_rsa_key.pub.age
index aab96ca7..31b32cd1 100644
Binary files a/secrets/data-access/ssh_host_rsa_key.pub.age and b/secrets/data-access/ssh_host_rsa_key.pub.age differ
diff --git a/secrets/files/programs/ssh/host_configuration.age b/secrets/files/programs/ssh/host_configuration.age
index 28e4774c..e1f813cf 100644
Binary files a/secrets/files/programs/ssh/host_configuration.age and b/secrets/files/programs/ssh/host_configuration.age differ
diff --git a/secrets/files/programs/transmission/config.json.age b/secrets/files/programs/transmission/config.json.age
index 430435b1..274e94f4 100644
Binary files a/secrets/files/programs/transmission/config.json.age and b/secrets/files/programs/transmission/config.json.age differ
diff --git a/secrets/files/programs/vpn/global.age b/secrets/files/programs/vpn/global.age
index 79b86cfa..16d5e75d 100644
Binary files a/secrets/files/programs/vpn/global.age and b/secrets/files/programs/vpn/global.age differ
diff --git a/secrets/files/programs/vpn/local.age b/secrets/files/programs/vpn/local.age
index 77ecfd5b..33628147 100644
Binary files a/secrets/files/programs/vpn/local.age and b/secrets/files/programs/vpn/local.age differ
diff --git a/secrets/files/services/matrix-appservice-slack/config.yml.age b/secrets/files/services/matrix-appservice-slack/config.yml.age
index 0afcfea5..82cf96e2 100644
Binary files a/secrets/files/services/matrix-appservice-slack/config.yml.age and b/secrets/files/services/matrix-appservice-slack/config.yml.age differ
diff --git a/secrets/files/services/matrix-appservice-slack/registration.yml.age b/secrets/files/services/matrix-appservice-slack/registration.yml.age
index c984ecd3..8e1ac78a 100644
Binary files a/secrets/files/services/matrix-appservice-slack/registration.yml.age and b/secrets/files/services/matrix-appservice-slack/registration.yml.age differ
diff --git a/secrets/files/services/matrix-hookshot/config.yml.age b/secrets/files/services/matrix-hookshot/config.yml.age
index 149345ee..aa727f53 100644
Binary files a/secrets/files/services/matrix-hookshot/config.yml.age and b/secrets/files/services/matrix-hookshot/config.yml.age differ
diff --git a/secrets/files/services/matrix-hookshot/passkey.pem.age b/secrets/files/services/matrix-hookshot/passkey.pem.age
index dd5935d3..eb481bdb 100644
Binary files a/secrets/files/services/matrix-hookshot/passkey.pem.age and b/secrets/files/services/matrix-hookshot/passkey.pem.age differ
diff --git a/secrets/files/services/matrix-hookshot/registration.yml.age b/secrets/files/services/matrix-hookshot/registration.yml.age
index b7ace8da..5d691cfb 100644
Binary files a/secrets/files/services/matrix-hookshot/registration.yml.age and b/secrets/files/services/matrix-hookshot/registration.yml.age differ
diff --git a/secrets/files/services/matrix-synapse/config.yml.age b/secrets/files/services/matrix-synapse/config.yml.age
index 197ecd6b..deb130ff 100644
Binary files a/secrets/files/services/matrix-synapse/config.yml.age and b/secrets/files/services/matrix-synapse/config.yml.age differ
diff --git a/secrets/files/services/mautrix-whatsapp/config.yml.age b/secrets/files/services/mautrix-whatsapp/config.yml.age
index f0ceacf2..4385f8e4 100644
Binary files a/secrets/files/services/mautrix-whatsapp/config.yml.age and b/secrets/files/services/mautrix-whatsapp/config.yml.age differ
diff --git a/secrets/files/services/mautrix-whatsapp/registration.yml.age b/secrets/files/services/mautrix-whatsapp/registration.yml.age
index 1c469edd..7456e47f 100644
Binary files a/secrets/files/services/mautrix-whatsapp/registration.yml.age and b/secrets/files/services/mautrix-whatsapp/registration.yml.age differ
diff --git a/secrets/files/services/phone-push-url.age b/secrets/files/services/phone-push-url.age
index 041206b7..e7673189 100644
Binary files a/secrets/files/services/phone-push-url.age and b/secrets/files/services/phone-push-url.age differ
diff --git a/secrets/files/wireguard/elendel.privkey.age b/secrets/files/wireguard/elendel.privkey.age
index a9ec7625..18879844 100644
--- a/secrets/files/wireguard/elendel.privkey.age
+++ b/secrets/files/wireguard/elendel.privkey.age
@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 Lbmdyg wfHNJlvcsDkQB0A0RWJRAS/9QgaS+q0BAhXH0AtP6XU
-eukRm09R5Pw3PC63G8HAhrFt/xhvVQobccliYG3pHWg
--> ssh-ed25519 s9rb8g hNBVoN9baj3cv7aYf0PIv9Hgegfs+w+grL1VIrWHU1w
-4qONjF+ZDrs38hUHv0iFrc0U13U7AEqDbZgp070u3Bg
--> ssh-ed25519 +xxExQ zGT96f9BeEu2rFTzDK9Wg6OIERA2L2lEbFaMy1xJMBc
-0wRlxKKsKcXxX0Pg9EpB6rOIXUiJ0LGNQnELtJsVQOU
---- ghqW0lbgJ2Ms2McJKvlRvSljfkMA4w2/mvx5pkSe8Ao
-�8��gI�G�k^���MӎT�Dc�4�
��8N�K��%�O�?H����x3��`����%l{�t�%�Е[<�
\ No newline at end of file
+-> ssh-ed25519 Lbmdyg aXBY75w3jyW24vcXxLPVENvgfRI8r7g8ppwLgpfGziw
+kMHIm32MSAyH0bnGejxUfismh6zi9Hpep7wOk6aF7xY
+-> ssh-ed25519 s9rb8g Ih9ehfsdG6JP+qkUmcql6coyjt8A8NutUnl8OXW8YSo
+lOadnjiA44IGeQsPNCdDExe6Vl+s55bwDfBoQ3tF4rs
+-> ssh-ed25519 +xxExQ +/k1DdAQjnZ3y1126z8z0H05HHPuultZAOhVet3nA0Y
+2xFEA8+gBZN+2Z4dtoG7wOsCVNWkhrUl8CHHLi0bhSI
+--- aCj9As9HqY8QWiIMQyAboSTzn2yso6DQE8lHtIjDb2Y
+b'��l��_��G��V�+n��Z���sM��^ZZ��Is۔v�>���B�,�0z_��Z��g������V��s
\ No newline at end of file
diff --git a/secrets/files/wireguard/kholinar.privkey.age b/secrets/files/wireguard/kholinar.privkey.age
index 530f7556..fb7e57e2 100644
Binary files a/secrets/files/wireguard/kholinar.privkey.age and b/secrets/files/wireguard/kholinar.privkey.age differ
diff --git a/secrets/files/wireguard/lasting-integrity.privkey.age b/secrets/files/wireguard/lasting-integrity.privkey.age
index c2a115dc..bd391a15 100644
--- a/secrets/files/wireguard/lasting-integrity.privkey.age
+++ b/secrets/files/wireguard/lasting-integrity.privkey.age
@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 hKAFvQ 4jByH5msQft609HqXu5b3nTsZgLT1igOHFLQi+cjEDM
-yHqWpxf0QQ/tTLZz8VbxP5tG/kIDsm0PA3MHOlnoYfY
--> ssh-ed25519 s9rb8g srVPDeusUM1o1pIeEP8ZYH3YfWx1nqmb3YYlA+t2wXk
-vyfKRN/oIKb/HsmgQXC2la68amnW3vn6yrmRQesnAps
--> ssh-ed25519 +xxExQ UatgTEqurAIEJ2LnC80o0XANWxEMJOeQnzkj60+tBQw
-k9qE9mJ6inIYHpK80YK9tvew8IB3BrNPntsFaH7hT7c
---- JtzTC70lpiwEAkHnwLYL9VdYoJtaa2ybkoaDJ+dPLTM
-r�zi�J�Ծޡ�/T)�DwZ�qiwK+ou�1
=v\�&����������i�>�XI��IN��&��C�x���9
\ No newline at end of file
+-> ssh-ed25519 hKAFvQ r1EKFLxLgx7KdEzGqTP8+VeZsLBbSkMaUpA76VdR2VI
+1yz/fKIx5SS0T3vEMMZnua9QAf/N1FtTVY23Y7U1VDw
+-> ssh-ed25519 s9rb8g l3gzn8epU89Zi2Fz0lpNLuly8+0qqH0dRcDdjbof+yg
+zA9RUlf2RaSBZfLVq1QYb/j6y+Zz6/0wS85eByftveE
+-> ssh-ed25519 +xxExQ fZlEwT21i8SDYR2lVN+RkxLmS3UKQJmwIcsU5HIWCkU
+KOYsnCbqwMjDWS8PoqTn3GnVj36n6O7HhJAJZuve/NY
+--- dUHCqXM4h/Km6TgFDZ8uIrnpgjHQq19KpvISD+FhpMs
+�R��1�H��N����H�N�������_�V�hS[Ì0�XKN�6Á�
+�����S��O���;�	����
\ No newline at end of file
diff --git a/secrets/files/wireguard/marabethia.privkey.age b/secrets/files/wireguard/marabethia.privkey.age
index e85f4b21..5a6add52 100644
Binary files a/secrets/files/wireguard/marabethia.privkey.age and b/secrets/files/wireguard/marabethia.privkey.age differ
diff --git a/secrets/files/wireguard/psk.age b/secrets/files/wireguard/psk.age
index 14b18760..d22345ca 100644
--- a/secrets/files/wireguard/psk.age
+++ b/secrets/files/wireguard/psk.age
@@ -1,20 +1,19 @@
 age-encryption.org/v1
--> ssh-ed25519 Lbmdyg y0PHW2qc80037gHeLoGv3xQsbDtq1hafeQ+XfXDq+DE
-EhKOCBfpBv0nSNgrodggyjt5ieQLEoCn/NVFMpjn+F8
--> ssh-ed25519 aUd9Ng fHC0sCNZC6G9hr7rbzt7fjw1oqWM57r3tSd6CCpuCHg
-YwY75l/fj8oc+IFu070pxEIooKzxlmP9KEW7T+kBp/c
--> ssh-ed25519 hKAFvQ RsPPPnQ4EW6tltxKIjiTDAF1+stjMPmpAnCR0hesXjs
-hNpRSv3fVkVEdLZ801ZCzBAahveGzkuEFXMCzKO+it4
--> ssh-ed25519 9+Fe5A IRQqvxpOlLMJCkSXuk1PYCIiMsIDIsDtxx5indceXlA
-sk7nvBrBFq49LsgVrqyFy79braWWAveQUkeCKt0oGws
--> ssh-ed25519 KOkamg 0UsyKfZWoiGVLQfSYs2zXFd8VyHzrC+l4afjGbmeJXE
-8mZEZxrrzPEBYRfQz9DjWVm/qX8t6xIVYMDf4JSAGPU
--> ssh-ed25519 9PfEBQ rIuknd/x+nQCXlvAxhlyCrTv/2QCTmeu/k2aN+v0CXc
-gekdCSzygefjKsiUPXyxywTMYW6kJUAyVwwSoNfMkOM
--> ssh-ed25519 s9rb8g oPTtr3NozbMCeVjV6bj4vHTWW6vJOtDsx5nWeXSyAjc
-MXNgnjlWJIEa/OCVFpCPh96BVhQh1/o9BSLeVCk75EU
--> ssh-ed25519 +xxExQ TLwKJX/bAnYelpcFSNN8REgSB3I/fxEkad+95dVo2To
-5v28cAufry5XlmhM0cxW+C+x6gtUrtzH3kciWe++Lf0
---- dLgrrSuJoIS/q+Vuxn4QJDNLNxgFK9E/RWYtcbRz79k
-���m�G��Y� ~�ʷ��j�I��
-{�	R�Uw��B6��Pg��}�!��	��ETj�P\3/����|P���Xw
\ No newline at end of file
+-> ssh-ed25519 Lbmdyg QesIN+OUAf3UyYB7zhoJC3zsfoJ5uAcjcpOosNMpyDg
+Vmj6H3GB2NS1nyiQmmGBpL6Pg2Od0mAfzwMwbSsnbjs
+-> ssh-ed25519 aUd9Ng 7O73Pkke4B2y82NlBXnGsqHe4lx5Au61xPY110DPGXM
+TjXDh0p/k9htA0fv5GONCjTVFWTX3Ctm2eSUlWhehl0
+-> ssh-ed25519 hKAFvQ r+lA4z9dSgSKStVqV00GCuSeWQdfZXsy6b+qA5TZuX4
+FgZVlGM9aAnlj/DpQHhryp8QUZf2285mX8UL8LL/oEw
+-> ssh-ed25519 9+Fe5A Uyee2auVDsfr3MwCgDCdURTlD2PtvRdIhziwm2XbbGU
+lJ1yqkx5EAf/K+0+Kaf/0m8jVZ5v/KDfqb272Ezgldo
+-> ssh-ed25519 KOkamg XEE0Unqi/Wy4GwcCLjkAkIJcooNuva1xNchEfUX+Z0Q
+ZZuy4shR+SXDfuHxEs7Ilwp/zcqDNtGnVG9lug5pngw
+-> ssh-ed25519 9PfEBQ N40cfGPzvj7Kcx9ZZCielgj4cfEmJkkckSp/MN5Ram4
+iwxOEsjqJ2oDvafuh1pib8eG/O5U++rzqbHRbRGqxSQ
+-> ssh-ed25519 s9rb8g X8MwMMvazTqQr+nm+4MkPsLYCzIqfJ2Cv1ZznxTKjAk
+GBC1V/zrXivh4/OTaejR8Fx8JtgGzqkwOAXIeCAtvIc
+-> ssh-ed25519 +xxExQ iJlEA5WzQZBB1S/cERy/5N+EtPFrl3zTPEMFSb1ZoSw
+KfFnW0uT5en1dZk07xN6JfHEyhQgEFIVpLP/9TwwBDM
+--- IrJHecandDGS8dy1TURsNJpbCAC6UO/y6OWnE0hnBBk
+�=�+��5�[�x<�����	 yuŷJ���.�_���F�|	��\s[��f$p���N$��d��k�cg]��+b
\ No newline at end of file
diff --git a/secrets/files/wireguard/thaylen-city.privkey.age b/secrets/files/wireguard/thaylen-city.privkey.age
index cf7b2f22..1e6a3f93 100644
--- a/secrets/files/wireguard/thaylen-city.privkey.age
+++ b/secrets/files/wireguard/thaylen-city.privkey.age
@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 KOkamg ycsVX6qL5n3DSICalyKgqr8V8DGcDYE4qrKhB5VRKVo
-c3bLsLwp1UlLtjf2eTUJHqfGZHmohvYZnjU91MYkKlM
--> ssh-ed25519 s9rb8g FTQptebEEd2xR3hN6MFJVfy277Q+G78fHpvI9HR5GTU
-YViBufWD2WB7txk7slYDc/WCgemP2Fxb2Yk/YXoLp9o
--> ssh-ed25519 +xxExQ aK7M3j7fdXUPPBHG6kzBd+LqMu/PlWxNbEjmKjj8a0w
-Rf0Cjkskj0/sDfJ3ouQBRhmmj+7Hm9w3nNsoRg2pPZ8
---- akTPwWRcWEIgPHmmirrz3vFhJ94Kp71c8WYFqen4Y3s
-�(Ж�y@Fb6��ݝ��E�RF�M��y�W�&�ħ��Cj[��7��B4�N��9"
f����<��� 򏑹 ��?3
\ No newline at end of file
+-> ssh-ed25519 KOkamg kqnCtpVYWj0f0HjOfF2iq32ostrgbef5KfHvTkt5nkY
+TNcQ1ys28tXcapi7LpXSD2G9hfqe7230rpaliFp2I3I
+-> ssh-ed25519 s9rb8g PlT7/2UapCbPUQSk6eV8g9m2tWbO7GKvfME+bY1T3Go
+moXCQnbGMRZe16JNQGxNrhyUWMUh/Th0yn+g/6r7mAw
+-> ssh-ed25519 +xxExQ Nm+O3vyvPR36ZOD+fmdCtQf+0ad7IagnSYSGwUdMRG4
+PCpTpVUeB/WblaRXCUtFh6cgEsBSJ9jZcc0M+p6+b7c
+--- GUoqPN64IZpcq2xNsmSBpXdp8RHOxRqYEGMW3Lkika0
+��UF'�@$]�k:�k�E
�{ӌ�u�2>���-~C��B��������|��k }bc�<
��� �����
\ No newline at end of file
diff --git a/secrets/files/wireguard/urithiru.privkey.age b/secrets/files/wireguard/urithiru.privkey.age
index f5daa745..fafa81b9 100644
--- a/secrets/files/wireguard/urithiru.privkey.age
+++ b/secrets/files/wireguard/urithiru.privkey.age
@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 9PfEBQ 74N9hlQqd9oD8xWufftHEyDMeOiQJ/apEWEv2LRF5UI
-hhv45dE+YaDzc/x6yeVIHXdhi+Rigx8MpRnTtho7FME
--> ssh-ed25519 s9rb8g mUG7y108r2E52qTq02eIX0De9SSVnKqlJqCbK/JT82g
-2V6FDuJkevAzxlkxSAu92HReKkOVCM5p16aIZG5isUw
--> ssh-ed25519 +xxExQ sgR2+A06k10fj6yXMTZVpPxEzjVIxxigDmZkwxeNQ0g
-GFG6j4tiiJoBTM4uFnubGqroGCFgXbrZ7poBM1rFHtk
---- GkFm2oU04FpOZioNR3moloV5pt6/IfUzGq4/aHW/upk
-p�+H6�Mț�ק�~�Y���Ӌ�P	�rM����O�ra��S��z5�S?�"�}kz�Dnn��5E-�x�U3n�O��
\ No newline at end of file
+-> ssh-ed25519 9PfEBQ gtuXTo7AhjC+c88MkjUULK9siWNEDcCZZkLFjKFMay0
+0IGgVaBXpFwuGMG8XgtsPw+4WglmEyZ25ve2JK1hzEc
+-> ssh-ed25519 s9rb8g L2cI9agUghYqyJJDnXyLGWNnRH68tiuxiDcqKqo+UGs
+SHi3XIqfmbljHJMlERyiNK6XX2PpAst9569H4c5OqnQ
+-> ssh-ed25519 +xxExQ 6jMlEst38fs9brwOxsCgW59pXtuc0trTZnYLUeV7rlk
+LS0Oc+R/mpYwG3MLO/rT8r79d/QsWyf9PnhAxzjob94
+--- HSk8KSaQMTQ0lLOlcwPLPhJ6Y0+r7XUtGM8267d0nQw
+/ľ�
�T�r>�>����!�m��{�~�7Ղ���"&��.������B�ML��������ɫk�κA�m��u��
zj
\ No newline at end of file
diff --git a/secrets/passwords/networks.age b/secrets/passwords/networks.age
index 614a6dff..c6018130 100644
Binary files a/secrets/passwords/networks.age and b/secrets/passwords/networks.age differ
diff --git a/secrets/passwords/services/accentor.age b/secrets/passwords/services/accentor.age
index 79f46455..1b33278d 100644
Binary files a/secrets/passwords/services/accentor.age and b/secrets/passwords/services/accentor.age differ
diff --git a/secrets/passwords/services/acme.age b/secrets/passwords/services/acme.age
index c38c20a4..cd03951c 100644
--- a/secrets/passwords/services/acme.age
+++ b/secrets/passwords/services/acme.age
@@ -1,15 +1,15 @@
 age-encryption.org/v1
--> ssh-ed25519 Lbmdyg aSrHQP3zlXG2PUNbnOeBfO1xzpDjkogeQqt5N4mRGRw
-WU1KA0e7T5YgVvuYUdJsJrCtELJHLRTK3JKtfAHR7jE
--> ssh-ed25519 hKAFvQ HVKGGn0PnqSnR7C3SoXjpiZYWQBUdvsdmLd1/IOhREM
-lAQLsZXBQTTUTQrrjfGewDZn1+Vk/ZjlIad6edZy538
--> ssh-ed25519 9+Fe5A 37166pk/tLti34xDYlcyo32H2rZE9/U2cJ37GXFqdHY
-5XeyypUc0rsJO9FAVspp2JHqElhUuRuz1vshm87v3lM
--> ssh-ed25519 9PfEBQ fHUur+UAohhiNgWEQfW+H7RP32lDN0nzjjTE8iPPs1Q
-QD7fLF/Belob0UE1nrk6lBGSNdJMNUPJAKaWz6us624
--> ssh-ed25519 s9rb8g dN6UdWtdrTvxhegcVBBznesEftnHQAmQkFWhnrFDBGg
-903QO3ugjusZY+mwXuzva65tJn5gMXLsU8lZQ3veiz0
--> ssh-ed25519 +xxExQ DydqlnDjBfOLXH3g8Qs2tEjkLrphzBt+plTmXPTFUj0
-7b7HQV7DzzOZ5bEbNfXD4lj95pjLlTJIoHw5szV1VGM
---- v0nFDXk0MFUcFrvaXvNWmuzB27NKNELfdGiBdtp0J/w
-.�ba��S�Y�q
���t�B��2�f�l�
����������y,����P�w�M1�i9Ù�2P�˴��/Z�.�b$��{�e����WsN��+����(�<_)�b3g��Tڋ��P���-'sn}
\ No newline at end of file
+-> ssh-ed25519 Lbmdyg 4OhD4Lr0ohs8J91Xq38/n3LjeHoMmyhIFSWZqtYccko
+1z+82OFSwb50ANO47qgQBMF08nHDzHP56Ebg4iFTM5E
+-> ssh-ed25519 hKAFvQ eCjeVffIRGPoY+lUlJS6EOmoah4iDWZyibCred8QXgQ
+qqClrkFcsoZ1tQQT2Ksux9ZQxY4sr5UHVy+teiIM3nI
+-> ssh-ed25519 9+Fe5A J8GQ/cb/GNduLGqoBImCzai6mgUJDsbGFbtplqRzAzE
+/6DZzmUS+UetyMPAmMEIwg7W1SQhr4OkGaXi4ZTVIr0
+-> ssh-ed25519 9PfEBQ vfEgGoF0lMGFIywwwwuLTL7ACfkbQ0XBfjgY4iL/Ji8
+3e/T8v1jN4jLlMnvHBDjuZK6JvK7urXw3RWhmcw/ims
+-> ssh-ed25519 s9rb8g KhptOTu3P1BMMQxn4yar++7M3VdGT+1NnoqLfCNkn2U
+3kNSyex9ZH+IBOGSq6UsDAHKiHjAeFJOlFJPOa5AYHE
+-> ssh-ed25519 +xxExQ 30/EHGMLGw5NI9czsHclGL5PzRC12NrELLZR88WgTmg
+jNfOheYExYAFsf/ZaD0qC8EjcnRwlcS0+jVe8rmF3c0
+--- 5ZtmtO/f6DeB+ZyepWLklN4OJTIq+QmhQJo/76f0IJE
+�̙�	&�.N܏���X�/-��KB1�6��C��H
���nNj`��LSm�te(���:-%(�J�a[,��/��w�Bi��k��3	)��/��)�/D�~�]�Մ�	R����ŌB�Ir[M��
\ No newline at end of file
diff --git a/secrets/passwords/services/data-basic-auth.age b/secrets/passwords/services/data-basic-auth.age
index 0d68d6a5..31c2ebd3 100644
Binary files a/secrets/passwords/services/data-basic-auth.age and b/secrets/passwords/services/data-basic-auth.age differ
diff --git a/secrets/passwords/services/git/mail-password.age b/secrets/passwords/services/git/mail-password.age
index ebcd0da4..53a86b9c 100644
Binary files a/secrets/passwords/services/git/mail-password.age and b/secrets/passwords/services/git/mail-password.age differ
diff --git a/secrets/passwords/services/git/token-file.age b/secrets/passwords/services/git/token-file.age
index e3e03386..715cfcb6 100644
--- a/secrets/passwords/services/git/token-file.age
+++ b/secrets/passwords/services/git/token-file.age
@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 Lbmdyg cABXwN8uCvOQeIY2OfFpoL8EgaOoDdPkqt92m7mMSG4
-bEPTmKhs8okfFcyOSgB8XoH8ikt2vcgYzgsd7Matj54
--> ssh-ed25519 s9rb8g zitGUHHflVnu1an2YmwP/QbqR/oeOpD0KfUNaWyHuFI
-Cak/sV0D/GVzw6N+DWWDo+TMro7LW1wGiyQhgrvKZmg
--> ssh-ed25519 +xxExQ oYEAtj4hKxgfXomhl3u1EJ8Lwk+SqVq4NuXBJWqN31w
-EPKBeERdfSAr05bo2PqVpST6XDMPJU6DtkfDjmXSD4I
---- E0glwxFRUN8bccBmFIw3ga5zgjBa0SBQy6PLVkEV33w
-�
LL��ĚY$��&�_(��������|@�+!{o܍W������N3�Ni�jI�2��wt�a��"1l���
\ No newline at end of file
+-> ssh-ed25519 Lbmdyg DErFevDfpb9M+anPWNBpxpieUMNgLSDN85Pk81E5xEM
+grj6O6c+8tseBxEKiI96BTnBYZPKK96HebZGSidwGmQ
+-> ssh-ed25519 s9rb8g kloh2jeVKr5w1mA0TYU9pm5seqa6rdtG0UJEFTJniGg
+Swpnu+kplD9mSBo0CsQ2BB9P59G3S6Hwd6oevP3t4ek
+-> ssh-ed25519 +xxExQ /9u47JtLGWyGfWG7MpxaGF2YNzc3NmXBDOE0+QdAExQ
+YkOj6y8wW/XGeJ/+zBexX8sqKiD5/xcT0EsJvBuEQw0
+--- 5jpqLM2RHZGDno9Z+ZiT6vPR1WbzSn8St1KTBDjHJ+8
+���10b������y2n׍â���j6Oh��-ګ���Z��#�n�Ϡ;�zU�#G�p2),��2���o�{	bj�O�
\ No newline at end of file
diff --git a/secrets/passwords/services/mail/charlotte_at_vanpetegem.be.age b/secrets/passwords/services/mail/charlotte_at_vanpetegem.be.age
index 4d22999d..8deaf9ab 100644
Binary files a/secrets/passwords/services/mail/charlotte_at_vanpetegem.be.age and b/secrets/passwords/services/mail/charlotte_at_vanpetegem.be.age differ
diff --git a/secrets/passwords/services/mail/git_at_chvp.be.age b/secrets/passwords/services/mail/git_at_chvp.be.age
index 965cb9dc..5b73fdd5 100644
Binary files a/secrets/passwords/services/mail/git_at_chvp.be.age and b/secrets/passwords/services/mail/git_at_chvp.be.age differ
diff --git a/secrets/passwords/services/mail/hallo_at_estherdereys.be.age b/secrets/passwords/services/mail/hallo_at_estherdereys.be.age
index fd754170..461a9e59 100644
Binary files a/secrets/passwords/services/mail/hallo_at_estherdereys.be.age and b/secrets/passwords/services/mail/hallo_at_estherdereys.be.age differ
diff --git a/secrets/passwords/services/mail/hallo_at_robbe.be.age b/secrets/passwords/services/mail/hallo_at_robbe.be.age
index 07e14e0e..1c07c0f7 100644
Binary files a/secrets/passwords/services/mail/hallo_at_robbe.be.age and b/secrets/passwords/services/mail/hallo_at_robbe.be.age differ
diff --git a/secrets/passwords/services/mail/huis_at_vanpetegem.me.age b/secrets/passwords/services/mail/huis_at_vanpetegem.me.age
index eb1d4bee..93943e94 100644
Binary files a/secrets/passwords/services/mail/huis_at_vanpetegem.me.age and b/secrets/passwords/services/mail/huis_at_vanpetegem.me.age differ
diff --git a/secrets/passwords/services/mail/info_at_eenstweedrie.be.age b/secrets/passwords/services/mail/info_at_eenstweedrie.be.age
index e96d7b02..77de1c59 100644
--- a/secrets/passwords/services/mail/info_at_eenstweedrie.be.age
+++ b/secrets/passwords/services/mail/info_at_eenstweedrie.be.age
@@ -1,9 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 9+Fe5A gCgx5GIc1ZjhvwWzzPJnTRk3605fNWoE5UieqyR0MU4
-tv2WUuO6gx8vzAnOo+YnfZ7uvzPgqRtOkKPy9Tt3Rb4
--> ssh-ed25519 s9rb8g BXfNxRkYSIWjMZt+xFvFgUxAQTxsWZYTwA5THqCMWx4
-4EI2G6FipAtBXv6wCPc3lSXyH2nDl5Z9CzR+gtiQY/w
--> ssh-ed25519 +xxExQ lzqxzFbaZ9KLcQBCE8hVWA/7icZokCW1AgZ3HCPNNF4
-J8H3t6TbQBzcr2XycuXXwF3charX8jQKbV/qVNX+aqI
---- +ihzz+e8xwKeP8VSLUZsan1uphEtnGhRHUJD4VTS6Lc
-�T��<{���)��_�	5�nZ��l Ju`��HTk<�2DvdDc���ܚcM�3E�S�Do=5ڥ�>H�w�:�ա�'Xs����
8e��
\ No newline at end of file
+-> ssh-ed25519 9+Fe5A dXBn5leegf3X0R8JXvnaFmZbxAZrt14WZntX4p8jWi8
+aJgIX0JENAeWu8yQItuac7DpxwV2wIOMX3lNL62UzYw
+-> ssh-ed25519 s9rb8g G1SfGi1+1EW6GW3JfsgECAyb/MPMreBLd2UqcVUVFEk
+QZ9xC5mP5A+0gueTspvnKaK7oHI9cujsqOI7qP5yh6Q
+-> ssh-ed25519 +xxExQ CSjKagyy9DM/oz1+UIT8z7pqCH3LP2+3K9z6FplqxS4
+odTzEPx/PSx0V8qYqaWhG2TSOmMTfcAd7yaSLO4kLAo
+--- 4uAAwWBJkXkDJcRaJsTA7jOaMFzyZqMZ4DssJSr26xE
+�'N��9Ṓe�`�����&���	Z�wԏl�a�-�� ���[�m�+;�R��ҹQ���
+�����bޗѓ�cj�A1����*��<hϯ�
\ No newline at end of file
diff --git a/secrets/passwords/services/mail/noreply_at_vanpetegem.me.age b/secrets/passwords/services/mail/noreply_at_vanpetegem.me.age
index 57263047..247cabdb 100644
Binary files a/secrets/passwords/services/mail/noreply_at_vanpetegem.me.age and b/secrets/passwords/services/mail/noreply_at_vanpetegem.me.age differ
diff --git a/secrets/passwords/services/mail/peter_at_vanpetegem.me.age b/secrets/passwords/services/mail/peter_at_vanpetegem.me.age
index 6ec8bed9..fea9c612 100644
--- a/secrets/passwords/services/mail/peter_at_vanpetegem.me.age
+++ b/secrets/passwords/services/mail/peter_at_vanpetegem.me.age
@@ -1,9 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 9+Fe5A vngnML17iCR20B4zohrbHiMBCJCiwnomFqDmEuibZWk
-UqjoDdLzYyDwqxn7v0efH6ncSObIdcncPtYItE9c7XA
--> ssh-ed25519 s9rb8g 5FrJNvHTfiP+TXaRvZM9HyFauauFrKeicbmw/1lh9k4
-Qv3hrLvgELvkDWzvER8KfyCOfao/utXoO9R6UNXY8+E
--> ssh-ed25519 +xxExQ B+Rzg2Q8Ul3s9Rnay5dx3I2d8+2cE6Kzs9BTD1JxQSo
-LHBVw3Oh9uVlxme0oljagJFXKPOA4hWMqLFWwBnnsgQ
---- BJ85LwXDO97tE8DfhAVIk7Xw5Ev+juqnWze+ueblN8A
-`�V������������gY���4���N)x�)����+Kڔ�j�1���Ͷ`P�s�['� ԒU�����
�7���(o�R�RN2V�, �
\ No newline at end of file
+-> ssh-ed25519 9+Fe5A jvWtFhx4gVd0/lQcA3m8VUQydt3rhTSlJmjF7RujwmM
+ChWn9mRjdq+X+2t1CXoTsP8oml+5ZcQtAGhPr6WuQSs
+-> ssh-ed25519 s9rb8g Q9xpbpgMbVkej5KmZD1pXEg3KTKtAbdI/NO3OKEnPiw
+7TzoD3hWnqkBsBJywCgVU2WxCHJWvPMqcnukmrWDHlc
+-> ssh-ed25519 +xxExQ Lg2wtNWzqFbTsFE1nbOTDK7MUWIaEqI+gJaterkQPmY
+wDdGqsstOVElMXW0/iY0d7aXSoIIXz653tP2WWysjF0
+--- I8/vlF+yWyWWLDJkBojZsvuGVz8KtevgZGpdSdxk4wU
+G�4n��5v+�7�W-v�
@W#�/����0�����{���:4�
+���_������%��'����54�����|X���A�e0H�G`c�"�B��
\ No newline at end of file
diff --git a/secrets/passwords/services/mail/postbot_at_vanpetegem.be.age b/secrets/passwords/services/mail/postbot_at_vanpetegem.be.age
index 796b9b90..f935c178 100644
Binary files a/secrets/passwords/services/mail/postbot_at_vanpetegem.be.age and b/secrets/passwords/services/mail/postbot_at_vanpetegem.be.age differ
diff --git a/secrets/passwords/services/mail/robbe_at_robbevanpetegem.be.age b/secrets/passwords/services/mail/robbe_at_robbevanpetegem.be.age
index ddafd5bc..76cc722c 100644
Binary files a/secrets/passwords/services/mail/robbe_at_robbevanpetegem.be.age and b/secrets/passwords/services/mail/robbe_at_robbevanpetegem.be.age differ
diff --git a/secrets/passwords/services/mail/robbe_at_vanpetegem.be.age b/secrets/passwords/services/mail/robbe_at_vanpetegem.be.age
index fe98dd3e..7d486bf7 100644
Binary files a/secrets/passwords/services/mail/robbe_at_vanpetegem.be.age and b/secrets/passwords/services/mail/robbe_at_vanpetegem.be.age differ
diff --git a/secrets/passwords/services/mail/webmaster_at_vanpetegem.be.age b/secrets/passwords/services/mail/webmaster_at_vanpetegem.be.age
index 313bf9ed..5a5e66cd 100644
Binary files a/secrets/passwords/services/mail/webmaster_at_vanpetegem.be.age and b/secrets/passwords/services/mail/webmaster_at_vanpetegem.be.age differ
diff --git a/secrets/passwords/services/nextcloud-admin.age b/secrets/passwords/services/nextcloud-admin.age
index e160bcc8..22b8bccd 100644
--- a/secrets/passwords/services/nextcloud-admin.age
+++ b/secrets/passwords/services/nextcloud-admin.age
@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 9+Fe5A qN+BpuvfwqUp4UdtVbcZmG4NhJC+pXfbztYISQiPdSc
-kKyPMgHE354AwJCcCxjtzk/s/M9G7xdh0/9eHxa/pMo
--> ssh-ed25519 s9rb8g MP7pWfzJ+UnJe5Lx4bRnxK6EJHLgeH2/mWAh2xmQWx8
-yOKmwyPMewGhFiTv3dziD/KVZyaKhzchWBVZPOJBuSw
--> ssh-ed25519 +xxExQ XX2zkyMoQl1wRtl2F6IONz2qA3Dc7nB527/iw0aV8GQ
-MaAGFaREFUQpLmP9pth5j6iBAYAiA4ljTjnP0M9O5LM
---- XY+5Qs9iHayv5OiaCXM+Sm9EQTU01DRIsIs42RQUNIM
-+�6�Gدr�n.�z���ݑ���6�'	�U��+
>_�z��\=>��mL����wk��
\ No newline at end of file
+-> ssh-ed25519 9+Fe5A 98DCxUgx9jadLkb36gv6ZGN39GVzX+1au+GxeaAErzQ
+ZCj44HM7G3BTSE9AmQyXCGSn+6ilCfg4Inq/6NzA7s4
+-> ssh-ed25519 s9rb8g bEVKXZL6TJZORFwJZ5/wOSwpeHUK15MzIbpeI83rzC8
+jwbcZDQ6y3rcn5/rO3OHw1qJtq5pUUNahk8MIt06WKg
+-> ssh-ed25519 +xxExQ vy155jUYHWFha7LWoTfM8wsG1RqMrpYvhqJXXIcuwAk
+hJNrzPrtvxoDWLbkl4Rrm9KH7SC1LwzmUXt8U9BGvoI
+--- vpuSQ2feq07nXvEEVQDdAJEqdft/s4Bu/ss2hP1zdz0
+�h�2 ��N�5i�f���қ��ȇ�������U�&t�e^��%Ҥ@���xgO��
\ No newline at end of file
diff --git a/secrets/passwords/services/ssmtp-pass.age b/secrets/passwords/services/ssmtp-pass.age
index b1dcd694..84ec02f1 100644
Binary files a/secrets/passwords/services/ssmtp-pass.age and b/secrets/passwords/services/ssmtp-pass.age differ
diff --git a/secrets/passwords/users/charlotte.age b/secrets/passwords/users/charlotte.age
index 93af4241..b90cdfbb 100644
Binary files a/secrets/passwords/users/charlotte.age and b/secrets/passwords/users/charlotte.age differ
diff --git a/secrets/passwords/users/root.age b/secrets/passwords/users/root.age
index bba16dc4..59e7b0f1 100644
--- a/secrets/passwords/users/root.age
+++ b/secrets/passwords/users/root.age
@@ -1,18 +1,20 @@
 age-encryption.org/v1
--> ssh-ed25519 Lbmdyg zSbZ1JxLiNpy1NEyXZ5rEiBhwePYDX4v973uLfZP51M
-uB+KQ76yFlSDpP+QLlZmr408FSPuVccPKisRClQdvRw
--> ssh-ed25519 aUd9Ng pWvp37LjgcVAjYZHTGkLMqQYd+e2g7k1385oE9/lYH4
-ZrccfOEQMBCI2+ayjW9P/cqPl1Gor7UJ3TFC7lQMg1Q
--> ssh-ed25519 hKAFvQ 2hFCp8gLvCX1zqFFzUJoIieLa7+2aVeRyCRFyegbRWo
-BSUK/Azzf0wJAlPuOY4rQPsN0OGCTPtlsmYFu5qsaIY
--> ssh-ed25519 9+Fe5A OZAthYKVhizQFsthJAparozgSFb2Zb2/5MRzg2tTIGI
-2/Fcr3iIu2UK2Xz9TZSwaOuPV7mVVcdHAkaR9dkFY9Y
--> ssh-ed25519 9PfEBQ jsDAjdyYYZHQPFJneADzeyQi4ZrrQStUZ7Bb2irmTAk
-/KrE4wtRXm2muX0bSSV3BTG56u4OqpRhjxJhLDBuxWA
--> ssh-ed25519 s9rb8g HAGcPh0HjKtiewYqQwox3AIvHp/KDDKROAstbf8RtVk
-x0Hw4QkkayukTZbos4AoDs6t1y4B7DHXevC4269B0eo
--> ssh-ed25519 +xxExQ TmRW0nlIbykeBBjPe+TBz64jY1/PVlS+wWvq/YhGfTk
-5WdC7ehRLjEpDM6r6rmPpK77zewMHloSneTs7WwEYBw
---- RD5lWGw0AhWNIQRc7MI3bx91LRt2fTNiGom7BYB8Gos
-?o1�t�u�xT��px's��*v��0"�����LSŻ���v���ɥ�]��(Y_{yuL
-;�/.f�f���Yg��L���}>
����
��$�	�z8��Ӭ~~���/�Q�����L��$+��'r�>sIG9�w�J
\ No newline at end of file
+-> ssh-ed25519 Lbmdyg 8bPvYXQEd8SHm+icoRsbS0iDTGBQ7nw184m7ke+Lin4
+GRD0BofX20iKeSRxdlt44E13zMZI6pscc5oZKvA7RQ8
+-> ssh-ed25519 aUd9Ng /azvX9MDKZjJZI120yl+TkNQpHrvAfloz3Iwxi0oMBs
+c84OGQz1B7aKzfWg+ohVfNslOGiKAy2Y3nMFHxWd6h0
+-> ssh-ed25519 hKAFvQ Zy1IupeW99MFanuzgl7ssQeR8kvNYp+f6Nf+faMprjc
+oJ6CYeb1c4WX8a9f7lVNXrZiA8PhXA8n9igch9ereKE
+-> ssh-ed25519 9+Fe5A Zg9572HtfOtJXVN26Git/NbIUTWl5T7GekWoTbN6cXc
+mbPF70EwfiJIOdcqSowRgyAGRYDOxcxaghgC0Hps9hA
+-> ssh-ed25519 9PfEBQ 6Y16Mf5GUWUUgsv83jbGuhrO2ERZbLBzZzIVgCs0in0
+iHxK9tq7e0WmTbuRVyJV/az6yxNekeWphE6ke+23BuI
+-> ssh-ed25519 s9rb8g QJeGFulGf/9SehYLKhyUq5jk+zwvv6jZj9POQKsSbGA
+loCUUOf6Bmt68IOY2anEH5yKqrNiWFrO+5fUu5yU+rk
+-> ssh-ed25519 +xxExQ 1UUUm9yc6nZMFrbdfBhbaoNcifqnF+o+uulEAlDd1Uc
+YnlNEKUeSymudGiLlp3mJcjpOceGthjeWpzi88ONc4I
+--- gLMgaNkr6HpRLTtmg8H2fDs8nrxa+FTXXLKgc13ULdw
+щ4��u�D��
+�R�Ha��Vkk��.f��#�*�k�����j_���[@�������83Qn�mZty�)��E��[.��hO�
+�
+�{B�1� �U9���\����_�]ä́�#�S��f{�rD��t���%�W
\ No newline at end of file