diff --git a/modules/services/server/matrix.nix b/modules/services/server/matrix.nix
index c72b825..6b59cc8 100644
--- a/modules/services/server/matrix.nix
+++ b/modules/services/server/matrix.nix
@@ -100,7 +100,8 @@ in {
         serviceConfig = {
           User = "mautrix-whatsapp";
           Group = "mautrix-whatsapp";
-          WorkingDirectory = "~";
+          Environment = "HOME=/var/lib/mautrix-whatsapp";
+          PrivateTmp = true;
         };
       };
       mautrix-signal = {
@@ -112,10 +113,15 @@ in {
         serviceConfig = {
           User = "mautrix-signal";
           Group = "mautrix-signal";
-          WorkingDirectory = "~";
+          Environment = "HOME=/var/lib/mautrix-whatsapp";
+          PrivateTmp = true;
         };
       };
   };
+  systemd.tmpfiles.rules = [
+    "d /var/log/mautrix-whatsapp - mautrix-whatsapp mautrix-whatsapp"
+    "d /var/log/mautrix-signal - mautrix-signal mautrix-signal"
+  ];
 
   users = {
     users = {
diff --git a/secrets/services/matrix/mautrix-signal.age b/secrets/services/matrix/mautrix-signal.age
index 7bb8033..0d5d69a 100644
Binary files a/secrets/services/matrix/mautrix-signal.age and b/secrets/services/matrix/mautrix-signal.age differ
diff --git a/secrets/services/matrix/mautrix-whatsapp.age b/secrets/services/matrix/mautrix-whatsapp.age
index 77ad0b2..62ea02f 100644
Binary files a/secrets/services/matrix/mautrix-whatsapp.age and b/secrets/services/matrix/mautrix-whatsapp.age differ