diff --git a/flake.nix b/flake.nix
index b22ae31..a81fd91 100644
--- a/flake.nix
+++ b/flake.nix
@@ -165,6 +165,22 @@
           ./hosts/monitoring
         ];
       };
+      nixosConfigurations."www" = nixpkgs.lib.nixosSystem {
+        #system = "x86_64-linux";
+        #pkgs = import nixpkgs { inherit system; };
+        inherit system;
+        modules = [
+          ./hosts/www
+        ];
+      };
+      nixosConfigurations."git-run" = nixpkgs.lib.nixosSystem {
+        #system = "x86_64-linux";
+        #pkgs = import nixpkgs { inherit system; };
+        inherit system;
+        modules = [
+          ./hosts/git-run
+        ];
+      };
     };
   #);
 }
diff --git a/hosts/common.nix b/hosts/common.nix
index 42d42e9..7397864 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -8,7 +8,7 @@
 {
   imports = [
     (modulesPath + "/virtualisation/proxmox-lxc.nix")
-    ../../services/node-exporter.nix
+    ../services/node-exporter.nix
   ];
 
   systemd.suppressedSystemUnits = [
diff --git a/hosts/matrix/default.nix b/hosts/matrix/default.nix
index 9362d37..f502edf 100644
--- a/hosts/matrix/default.nix
+++ b/hosts/matrix/default.nix
@@ -8,9 +8,6 @@
     ./nginx.nix
     ./synapse.nix
     ./draupnir.nix
-    ../../services/postgres.nix
-    ../../services/prometheus.nix
-    ../../services/grafana.nix
   ];
 
   networking = {
diff --git a/hosts/matrix/synapse.nix b/hosts/matrix/synapse.nix
index 97242b0..445f7ff 100644
--- a/hosts/matrix/synapse.nix
+++ b/hosts/matrix/synapse.nix
@@ -1,8 +1,5 @@
 { config, ... }:
 
-let
-  domain = "berlin.ccc.de";
-in
 {
   networking.firewall.extraInputRules = ''
     ip saddr 195.160.173.14 tcp dport 9009 accept
@@ -13,9 +10,9 @@ in
     matrix-synapse = {
       enable = true;
       settings = {
-        server_name = domain;
-        public_baseurl = "https://matrix.${domain}:443/";
-        # "/var/lib/matrix-synapse/homeserver.signing.key"
+        server_name = config.networking.domain;
+        public_baseurl = "https://${config.networking.hostName}.${config.networking.domain}:443/";
+        # Creates "/var/lib/matrix-synapse/homeserver.signing.key" on first launch
         signing_key_path = config.age.secrets.matrix_signing_key.path;
         registration_shared_secret_path = config.age.secrets.matrix_registration_shared_secret.path;
         database = {
@@ -73,17 +70,5 @@ in
       };
       enableRegistrationScript = true;
     };
-
-    postgresql = {
-      ensureUsers = [
-        {
-          name = config.services.matrix-synapse.settings.database.args.user;
-          ensureDBOwnership = true;
-        }
-      ];
-      ensureDatabases = [
-        config.services.matrix-synapse.settings.database.args.database
-      ];
-    };
   };
 }