diff --git a/modules/services/server/matrix.nix b/modules/services/server/matrix.nix
index 9d252ae..8a6fa98 100644
--- a/modules/services/server/matrix.nix
+++ b/modules/services/server/matrix.nix
@@ -251,6 +251,68 @@ in {
               };
           };
       };
+      mautrix-signal = {
+          enable = true;
+	  registerToSynapse = true;
+          environmentFile = config.age.secrets."services/matrix/mautrix-signal.env".path;
+          settings = {
+              homeserver = {
+                  address = "http://localhost:8008";
+                  domain = "kabtop.de";
+              };
+              appservice = {
+                  hostname = "127.0.0.1";
+                  provisioning.enabled = false;
+                  id = "signal";
+                  public = {
+                      enabled = false;
+                  };
+              };
+	      database = {
+	        type = "postgres";
+	        uri = "$MAUTRIX_SIGNAL_APPSERVICE_DATABASE"
+              bridge = {
+                  sync_channel_members = true;
+                  startup_sync = true;
+                  public_portals = true;
+                  double_puppet_server_map = {
+                    "kabtop.de" = "https://kabtop.de";
+                  };
+                  encryption = {
+                      allow = true;
+                      default = true;
+                      verification_levels = {
+                          receive = "cross-signed-untrusted";
+                          send = "cross-signed-untrusted";
+                      };
+		      pickle_key = "$MAUTRIX_SIGNAL_ENCRYPTION_PICKLE_KEY";
+                  };
+                  private_chat_portal_meta = "default";
+                  backfill = {
+                      disable_notifications = true;
+                  };
+                  permissions = {
+                      "@kabbone:kabtop.de" = "admin";
+                  };
+              };
+              logging = {
+                  loggers = {
+                    mau = {
+                      level = "WARN";
+                    };
+                    telethon = {
+                      level = "WARN";
+                    };
+                  };
+                  root = {
+                    handlers = [
+                      "console"
+                    ];
+                    level = "WARN";
+                  };
+              };
+          };
+      };
   };
 
   age.secrets."services/matrix/synapse.yml" = {
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 1ade7c5..f48759c 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -68,10 +68,11 @@ in
         "services/coturn/static-auth.age".publicKeys = servers ++ users;
         "services/matrix/synapse.age".publicKeys = servers ++ users;
         "services/matrix/mautrix-telegram.age".publicKeys = servers ++ users;
-        "services/matrix/telegram-registration.age".publicKeys = servers ++ users;
+        #"services/matrix/telegram-registration.age".publicKeys = servers ++ users;
         "services/matrix/mautrix-whatsapp.age".publicKeys = servers ++ users;
         "services/matrix/whatsapp-registration.age".publicKeys = servers ++ users;
         "services/matrix/mautrix-signal.age".publicKeys = servers ++ users;
+        "services/matrix/mautrix-signal.old.age".publicKeys = servers ++ users;
         "services/matrix/signal-registration.age".publicKeys = servers ++ users;
         "services/nextcloud/adminpassFile.age".publicKeys = servers ++ users;
         "services/nextcloud/dbpassFile.age".publicKeys = servers ++ users;
diff --git a/secrets/services/matrix/mautrix-signal.age b/secrets/services/matrix/mautrix-signal.age
index 626a20a..6690c12 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-signal.old.age b/secrets/services/matrix/mautrix-signal.old.age
new file mode 100644
index 0000000..626a20a
Binary files /dev/null and b/secrets/services/matrix/mautrix-signal.old.age differ