diff --git a/modules/services/server/matrix.nix b/modules/services/server/matrix.nix
index 6c7c163..f20d658 100644
--- a/modules/services/server/matrix.nix
+++ b/modules/services/server/matrix.nix
@@ -100,17 +100,19 @@ in {
         serviceConfig = {
           User = "mautrix-whatsapp";
           Group = "mautrix-whatsapp";
+          WorkingDirectory = ~;
         };
       };
       mautrix-signal = {
         description = "Matrix <-> Signal bridge";
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" "postgresql.service" "matrix-synapse.service" ];
-        requires = [ "postgresql.service" "matrix-synapse.service" "signald"];
+        requires = [ "postgresql.service" "matrix-synapse.service" "signald.service"];
         script = "${pkgs.mautrix-signal}/bin/mautrix-signal --config ${config.age.secrets."services/matrix/mautrix-signal.yml".path}";
         serviceConfig = {
           User = "mautrix-signal";
           Group = "mautrix-signal";
+          WorkingDirectory = ~;
         };
       };
   };
diff --git a/secrets/services/matrix/mautrix-signal.age b/secrets/services/matrix/mautrix-signal.age
index 8312d76..7bb8033 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 4afe297..77ad0b2 100644
Binary files a/secrets/services/matrix/mautrix-whatsapp.age and b/secrets/services/matrix/mautrix-whatsapp.age differ