diff --git a/agenix/hosts/tanker/config.nix b/agenix/hosts/tanker/config.nix
index 2dfb53a..0d98dc8 100644
--- a/agenix/hosts/tanker/config.nix
+++ b/agenix/hosts/tanker/config.nix
@@ -128,10 +128,6 @@
       file = ./mautrix-signal/config.age;
     };
 
-    signald-environment = {
-      file = ./signald/environment.age;
-    };
-
     synapse-extra-config = {
       file = ./synapse/extraConfig.age;
       owner = "matrix-synapse";
diff --git a/agenix/hosts/tanker/signald/environment.age b/agenix/hosts/tanker/signald/environment.age
deleted file mode 100644
index bbba159..0000000
--- a/agenix/hosts/tanker/signald/environment.age
+++ /dev/null
@@ -1,10 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 MtGp6g /N1cHH7SmlpEdvKEcMzVflInTXChp+eWJFU2RoPWMUk
-7nLndAtQ3DWXYmPvwq9tDPBiPLJMuDuCRtSXdFveSoo
--> ssh-ed25519 iO8/4g WSUXe/SRWLMN23PWyOM7qOCbXOFvTrzmTcq0zW/ABFs
-NmQoYqT0x6t0WByQrIg+OAvP4VUU5tVydAHfVTZvPUE
--> eo6mwb;-grease :nS'C`f ?/iI)
-oQ4Y4ksapQU8WwrdzObrSTiUiS37dk+c180046s7BqC6GX8iXFjR9kQSPb6tR9bl
-Nhh/zHwzdGQmy7VekRL8ZdpbUeKd5D6X7w
---- aHWIb4WJ+O2kXUGFczOA6ngejy6jkMOmrFmcKLllq8s
-*?DG��L5����Bf&AH�;��a�s��%1�h1rdO���&�q"D�`CQ�5���x�q���2
���_�[g����Dd��'+�g�)6n��/�*,�;lxS;R[����c�	�(
\ No newline at end of file
diff --git a/secrets.nix b/secrets.nix
index 30f13d8..c69deaf 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -61,8 +61,6 @@ in
 
   "agenix/hosts/tanker/mautrix-signal/config.age".publicKeys = tanker;
 
-  "agenix/hosts/tanker/signald/environment.age".publicKeys = tanker;
-
   "agenix/hosts/tanker/mautrix-whatsapp/config.age".publicKeys = tanker;
 
   "agenix/hosts/tanker/weewx/config.age".publicKeys = tanker;
diff --git a/system/nixos/matrix/mautrix-signal.nix b/system/nixos/matrix/mautrix-signal.nix
index e36b444..cbb2862 100644
--- a/system/nixos/matrix/mautrix-signal.nix
+++ b/system/nixos/matrix/mautrix-signal.nix
@@ -1,20 +1,23 @@
 { pkgs, config, lib, ... }:
 
 {
-  services.signald.enable = true;
-  systemd.services.signald.serviceConfig.EnvironmentFile = [
-    config.age.secrets.signald-environment.path
-  ];
+  # Re-use old signald user and group
+  users.users.signald = {
+    group = "signald";
+    isSystemUser = true;
+  };
+
+  users.groups.signald = { };
 
   systemd.services.mautrix-signal = {
     description = "A Matrix-Signal puppeting bridge";
     wantedBy = [ "multi-user.target" ];
-    requires = [ "matrix-synapse.service" "signald.service" ];
-    after = [ "matrix-synapse.service" "signald.service" ];
+    requires = [ "matrix-synapse.service" ];
+    after = [ "matrix-synapse.service" ];
     restartTriggers = [ "${config.age.secrets.mautrix-signal-config.file}" ];
     serviceConfig = {
-      User = config.services.signald.user;
-      Group = config.services.signald.group;
+      User = "signald";
+      Group = "signald";
       LoadCredential = [ "config:${config.age.secrets.mautrix-signal-config.path}" ];
       ExecStart = "${lib.getExe pkgs.mautrix-signal} --config=%d/config --no-update";
       Restart = "on-failure";