diff --git a/cluster/services/matrix/default.nix b/cluster/services/matrix/default.nix
index 5c4a962..7cc5f29 100644
--- a/cluster/services/matrix/default.nix
+++ b/cluster/services/matrix/default.nix
@@ -2,14 +2,21 @@
 
 {
   services.matrix = {
-    nodes.homeserver = [ "VEGAS" ];
-    nixos.homeserver = [
-      ./homeserver.nix
-      ./coturn.nix
-      ./bridges/discord.nix
-      ./federation.nix
-      ./web-client.nix
-    ];
+    nodes = {
+      homeserver = [ "VEGAS" ];
+      static = config.services.websites.nodes.host;
+    };
+    nixos = {
+      homeserver = [
+        ./homeserver.nix
+        ./coturn.nix
+        ./bridges/discord.nix
+      ];
+      static = [
+        ./federation.nix
+        ./web-client.nix
+      ];
+    };
   };
 
   monitoring.blackbox.targets.matrix = {
@@ -23,8 +30,8 @@
       config.services.matrix.nodes.homeserver;
   in {
     matrix.target = homeserverAddrs;
-    chat.target = homeserverAddrs;
     stun.target = homeserverAddrs;
     turn.target = homeserverAddrs;
+    chat.consulService = "static-lb";
   };
 }
diff --git a/cluster/services/matrix/federation.nix b/cluster/services/matrix/federation.nix
index da5ea82..0aed4e4 100644
--- a/cluster/services/matrix/federation.nix
+++ b/cluster/services/matrix/federation.nix
@@ -8,6 +8,6 @@ in
 {
   services.nginx.virtualHosts."top-level.${domain}".locations = {
     "= /.well-known/matrix/server".alias = federation;
-    inherit (config.services.nginx.virtualHosts."matrix.${domain}".locations) "= /.well-known/matrix/client";
+    "= /.well-known/matrix/client".return = "302 https://matrix.${domain}/.well-known/matrix/client";
   };
 }