diff --git a/container/webserver/config.nix b/container/webserver/config.nix
index fc3b367..c29058a 100644
--- a/container/webserver/config.nix
+++ b/container/webserver/config.nix
@@ -6,6 +6,8 @@
     "d /etc/container-webserver/weewx/html 0755 421 421"
     "d /etc/container-matrix/synapse 0755 991 991"
     "d /etc/container-matrix/telegram 0775 1337 1337"
+    "d /etc/container-matrix/signald 0775 0 0"
+    "d /etc/container-matrix/signal 0775 1337 1337"
   ];
 
   # mosquitto
@@ -113,4 +115,13 @@
     uid = 1337;
     gid = 1337;
   };
+
+  # Matrix: Signal
+
+  environment.etc."container-matrix/signal/config.yaml" = {
+    source = ../../secret/container/webserver/config/matrix/signal.yaml;
+    mode = "0640";
+    uid = 1337;
+    gid = 1337;
+  };
 }
diff --git a/container/webserver/default.nix b/container/webserver/default.nix
index 2c49fc8..6b88faf 100644
--- a/container/webserver/default.nix
+++ b/container/webserver/default.nix
@@ -182,6 +182,43 @@ in
           };
         };
       };
+
+      signald = {
+        service = {
+          image = "signald/signald:latest";
+          container_name = "signald";
+          restart = "unless-stopped";
+          depends_on = [ "ipv6nat" ];
+          networks = [ "webserver" ];
+          volumes = [
+            "/etc/container-matrix/signald:/signald"
+          ];
+          labels = {
+            "com.centurylinklabs.watchtower.enable" = "true";
+          };
+        };
+      };
+
+      matrix-signal = {
+        service = {
+          image = "dock.mau.dev/mautrix/signal:latest";
+          container_name = "mautrix-signal";
+          restart = "unless-stopped";
+          depends_on = [
+            "ipv6nat"
+            "synapse"
+            "signald"
+          ];
+          networks = [ "webserver" ];
+          volumes = [
+            "/etc/container-matrix/signal:/data"
+            "/etc/container-matrix/signald:/signald"
+          ];
+          labels = {
+            "com.centurylinklabs.watchtower.enable" = "true";
+          };
+        };
+      };
     };
 
     networks.webserver = {
diff --git a/secret/container/webserver/config/matrix/signal.yaml b/secret/container/webserver/config/matrix/signal.yaml
new file mode 100644
index 0000000..ac3c921
Binary files /dev/null and b/secret/container/webserver/config/matrix/signal.yaml differ
diff --git a/secret/container/webserver/config/matrix/telegram.yaml b/secret/container/webserver/config/matrix/telegram.yaml
index e414d00..125ed44 100644
Binary files a/secret/container/webserver/config/matrix/telegram.yaml and b/secret/container/webserver/config/matrix/telegram.yaml differ