diff --git a/modules/common/nginx-routes.nix b/modules/common/nginx-routes.nix
index 9a8534e..024dc98 100644
--- a/modules/common/nginx-routes.nix
+++ b/modules/common/nginx-routes.nix
@@ -7,8 +7,12 @@
     (Host "testing.coded.codes" (ReverseProxy "SamuelDesktop:3000"))
     (Hosts [ "kavita.coded.codes" "reading.coded.codes" ]
       (ReverseProxy "127.0.0.1:5000"))
-    (Host "clicks.codes" (ReverseProxy "127.0.0.1:3000"))
-    (Host "passwords.clicks.codes" (ReverseProxy "127.0.0.1:8452"))
+    (Host "clicks.codes" (Compose [
+      (Path "/.well-known/matrix/"
+        (File ./nginx/clicks.codes/.well-known/matrix))
+      (ReverseProxy "127.0.0.1:3000")
+    ]))
+    (Hosts [ "vaultwarden.clicks.codes" "passwords.clicks.codes" ] (ReverseProxy "generic:1028"))
     (Host "login.clicks.codes" (ReverseProxy "127.0.0.1:9083"))
     (Hosts [
       "syncthing.clicks.codes"
@@ -17,7 +21,7 @@
       "syncthing.hopescaramels.com"
     ] (ReverseProxy "127.0.0.1:8384"))
     (Hosts [ "gerrit.clicks.codes" "git.clicks.codes" ]
-      (ReverseProxy "127.0.0.255:1000"))
+      (ReverseProxy "generic:1024"))
     (Hosts [ "grafana.clicks.codes" "logs.clicks.codes" ]
       (ReverseProxy "127.0.0.1:9052"))
     (InsecureHosts [
@@ -36,12 +40,12 @@
       "smtp.coded.codes"
       "smtp.clicks.codes"
       "smtp.hopescaramels.com"
-    ] (ReverseProxy "127.0.0.1:1080"))
-    (Host "matrix.coded.codes" (Directory "${builtins.toString
+    ] (ReverseProxy "generic:1026"))
+    (Hosts ["matrix.clicks.codes" "matrix.coded.codes"] (Directory "${builtins.toString
       (pkgs.schildichat-web.override {
         conf = {
           default_server_config =
-            lib.pipe ./nginx/coded.codes/.well-known/matrix [
+            lib.pipe ./nginx/clicks.codes/.well-known/matrix [
               builtins.readFile
               builtins.fromJSON
             ];
@@ -56,7 +60,7 @@
           };
           setting_defaults = { "fallbackICEServerAllowed" = true; };
           default_theme = "dark";
-          permalink_prefix = "https://matrix.coded.codes";
+          permalink_prefix = "https://matrix.clicks.codes";
           disable_guests = true;
           disable_3pid_login = true;
         };
@@ -67,10 +71,10 @@
       (Path "/nucleus/" (ReverseProxy "SamuelDesktop:10000")))
     (Host "coded.codes" (Compose [
       (Path "/.well-known/matrix/"
-        (File ./nginx/coded.codes/.well-known/matrix))
+        (File ./nginx/clicks.codes/.well-known/matrix))
       (Redirect "https://clicks.codes$request_uri")
     ]))
-    (Host "matrix-backend.coded.codes" (Compose [
+    (Host "matrix-backend.clicks.codes" (Compose [
       (Path "/_synapse/admin/" (Status 403))
       (ReverseProxy "127.0.0.1:4527")
     ]))
@@ -78,9 +82,7 @@
   clicks.nginx.serviceAliases = with helpers.nginx; [
     (Aliases "nextcloud.clicks.codes" [
       "cloud.clicks.codes"
-      "docs.clicks.codes"
       "www.cloud.clicks.codes"
-      "www.docs.clicks.codes"
       "www.nextcloud.clicks.codes"
     ])
     (Aliases "privatebin" [
@@ -95,13 +97,4 @@
       "www.privatebin.clicks.codes"
     ])
   ];
-  clicks.nginx.streams = with helpers.nginx; [
-    (ProxyStream 143 "127.0.0.1:1143" "tcp") # imap
-    (ProxyStream 993 "127.0.0.1:1993" "tcp") # imap
-    (ProxyStream 110 "127.0.0.1:1110" "tcp") # pop3
-    (ProxyStream 995 "127.0.0.1:1995" "tcp") # pop3
-    (ProxyStream 25 "127.0.0.1:1025" "tcp") # smtp
-    (ProxyStream 465 "127.0.0.1:1465" "tcp") # smtp
-    (ProxyStream 587 "127.0.0.1:1587" "tcp") # smtp
-  ];
 }