diff --git a/home/ssh.nix b/home/ssh.nix
index 8ad6abe..ffad008 100644
--- a/home/ssh.nix
+++ b/home/ssh.nix
@@ -17,6 +17,13 @@
           if isDarwin then "/Users/${primaryUser}/.ssh/github" else "/home/${primaryUser}/.ssh/github";
         user = "git";
       };
+      "git.cyperpunk.de" = {
+        hostname = "git.cyperpunk.de";
+        port = 12222;
+        user = "gitea";
+        identityFile =
+          if isDarwin then "/Users/${primaryUser}/.ssh/ssh" else "/home/${primaryUser}/.ssh/ssh";
+      };
     };
   };
 }
diff --git a/nixos/roles/gitea.nix b/nixos/roles/gitea.nix
index 148354b..4a75776 100644
--- a/nixos/roles/gitea.nix
+++ b/nixos/roles/gitea.nix
@@ -13,7 +13,7 @@ let
     stripRoot = false;
   };
 
-  domain = "git.cyperpunk.de"; # swap to git.cyperpunk.de for prod
+  domain = "git.cyperpunk.de";
   httpPort = 9000;
   sshPort = 12222;
 in
diff --git a/nixos/roles/matrix/clients.nix b/nixos/roles/matrix/clients.nix
index a7ff4c7..62c6c92 100644
--- a/nixos/roles/matrix/clients.nix
+++ b/nixos/roles/matrix/clients.nix
@@ -133,15 +133,31 @@ let
     '';
   });
 
+  cinnyConfigured = pkgs.cinny-unwrapped.overrideAttrs (_: {
+    postInstall = ''
+      cp ${
+        builtins.toFile "cinny-config.json" (
+          builtins.toJSON {
+            defaultHomeserver = 0;
+            homeserverList = [ "cyperpunk.de" ];
+            allowCustomHomeservers = false;
+          }
+        )
+      } $out/config.json
+    '';
+  });
+
 in
 {
   services.nginx.virtualHosts = {
     "cinny.cyperpunk.de" = {
       forceSSL = true;
       enableACME = true;
-      root = "${pkgs.cinny}";
+      root = "${cinnyConfigured}";
+      locations."/" = {
+        tryFiles = "$uri $uri/ /index.html";
+      };
     };
-
     "element.cyperpunk.de" = {
       forceSSL = true;
       enableACME = true;
diff --git a/nixos/roles/matrix/synapse.nix b/nixos/roles/matrix/synapse.nix
index bf8b498..e33019f 100644
--- a/nixos/roles/matrix/synapse.nix
+++ b/nixos/roles/matrix/synapse.nix
@@ -128,7 +128,7 @@ in
             ];
             allow_existing_users = true;
             user_mapping_provider.config = {
-              localpart_template = "{{ user.preferred_username }}";
+              localpart_template = "{{ user.preferred_username.split('@')[0] }}";
               display_name_template = "{{ user.displayname }}";
             };
           }
diff --git a/nixos/roles/nginx.nix b/nixos/roles/nginx.nix
index 9785fc5..ff8e765 100644
--- a/nixos/roles/nginx.nix
+++ b/nixos/roles/nginx.nix
@@ -56,19 +56,7 @@ in
       };
       "search.cyperpunk.de" = mkProxy 11080;
       "file.cyperpunk.de" = mkProxy 10000;
-      "ngx.cyperpunk.de" = {
-        forceSSL = true;
-        enableACME = true;
-        locations."/" = {
-          proxyPass = "http://${upstream}:28101";
-          proxyWebsockets = true;
-          extraConfig = ''
-            sub_filter '</head>' '<link rel="stylesheet" type="text/css" href="https://theme-park.dev/css/base/paperless-ngx/catppuccin-mocha.css"></head>';
-            sub_filter_once on;
-            proxy_set_header Accept-Encoding "";
-          '';
-        };
-      };
+      "ngx.cyperpunk.de" = mkWsProxy 28101;
       "vault.cyperpunk.de" = mkWsProxy 8222;
       "calvin.cyperpunk.de" = mkWsProxy 15006;
       "auth.cyperpunk.de" = mkHttpsProxy 8444;