diff --git a/caddy.nix b/caddy.nix
index 0de0ea6..766ba3b 100644
--- a/caddy.nix
+++ b/caddy.nix
@@ -163,7 +163,16 @@ in {
           hide .git
         }
 
-        redir /.well-known/matrix/* https://matrix.catnip.ee/{uri}
+        handle /.well-known/matrix/client {
+          header Content-Type application/json
+          header Access-Control-Allow-Origin *
+          respond `{"m.homeserver":{"base_url":"https://matrix.catnip.ee/"},"org.matrix.msc3575.proxy":{"url":"https://sliding-sync.catnip.ee"}}`
+        }
+        handle /.well-known/matrix/server {
+          header Content-Type application/json
+          header Access-Control-Allow-Origin *
+          respond `{"m.server": "matrix.catnip.ee:443"}`
+        }
       '';
       "www.catnip.ee".extraConfig = ''
         redir https://catnip.ee{uri} permanent
diff --git a/containers.nix b/containers.nix
index 576b9eb..0d94051 100644
--- a/containers.nix
+++ b/containers.nix
@@ -131,6 +131,7 @@ in {
           WATCHTOWER_WARN_ON_HEAD_FAILURE = "never";
         };
         environmentFiles = [
+          # Contains WATCHTOWER_NOTIFICATION_URL
           "/etc/secrets/watchtower.env"
         ];
         cmd = [