diff --git a/modules/default.nix b/modules/default.nix
index 2d5a79b..1e9327e 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -6,7 +6,8 @@ in
 {
   imports = [
     ./wireguard.nix
-    ./matrix.nix
+#    ./matrix.nix
+    ./matrix_legacy.nix
     ./puffer.nix
     ./gitea.nix
     ./grafana.nix
@@ -18,7 +19,7 @@ in
     # ./discord-matrix-bridge.nix
     ./mastodon.nix
     ./nix_cache.nix
-    ./ooye
+    # ./ooye
     # ./auth.nix
     ./hedgedoc.nix
     # ./factorio.nix
diff --git a/modules/matrix_legacy.nix b/modules/matrix_legacy.nix
index 44b60e7..1d20f9f 100644
--- a/modules/matrix_legacy.nix
+++ b/modules/matrix_legacy.nix
@@ -42,7 +42,7 @@ in
     # The default value here is based on `server_name`, so if your `server_name` is different
     # from the value of `fqdn` above, you will likely run into some mismatched domain names
     # in client applications.
-    settings.public_baseurl = base_url;
+    settings.public_baseurl = "https://${vhosts.matrix_host.host}";
     settings.listeners = [
       {
         port = 8008;
@@ -67,6 +67,11 @@ in
       args = {
         user = "synapse";
         database = "synapse";
+          port = config.services.postgresql.settings.port;
+          cp_max = 10;
+          cp_min = 5;
+          client_encoding = "auto";
+          passfile = config.age.secrets.synapse_db_pass_prepared.path;
       };
     };
     settings.log_config = ./matrix_synapse_log_config.yaml;