diff --git a/flake.lock b/flake.lock
index 8595bd1..a087cd2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -373,11 +373,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1785946372,
-        "narHash": "sha256-JrhXaFbDW4KEKmLXb8q3x/D62L3emJw/TxvSvaCKR3k=",
+        "lastModified": 1785968564,
+        "narHash": "sha256-FokM9AdU8uxkJvdhniqfZNMHO/gEwWlfRcqRzWI1BQo=",
         "ref": "refs/heads/main",
-        "rev": "f798662396f8d19f5634b400d0a460103e934d10",
-        "revCount": 3317,
+        "rev": "31e47632f441adab9040e741530233ebd9211c34",
+        "revCount": 3334,
         "type": "git",
         "url": "https://forge.darkest.space/hyperhive/hyperhive.git"
       },
@@ -679,11 +679,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1785944985,
-        "narHash": "sha256-PMcEXUdzVtXFUThHwjnK3pGtcOPE3uNKfOd6oON093k=",
+        "lastModified": 1785966723,
+        "narHash": "sha256-77PN8w/GMo5ANgo0LFco+ipKv2fjIxhWqa0amYPJdI8=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "09ca0ebbc7f35b626aabad5a4d31f12b2f049776",
+        "rev": "766ca0dad1dc0e5a408f1f3c2540eb008d5e34f1",
         "type": "github"
       },
       "original": {
diff --git a/nixosConfigurations/muede-lpt2/default.nix b/nixosConfigurations/muede-lpt2/default.nix
index 31d08fe..2efad01 100644
--- a/nixosConfigurations/muede-lpt2/default.nix
+++ b/nixosConfigurations/muede-lpt2/default.nix
@@ -66,6 +66,6 @@
       enable = true;
       hiveName = "pr1ma";
     };
-    services.hyperhive.forge.ci.concurrency = 2;
+    services.hyperhive.enableAllLocalDefaults = true;
   };
 }
diff --git a/nixosConfigurations/muede-pc2/default.nix b/nixosConfigurations/muede-pc2/default.nix
index c4a3fba..c74c614 100644
--- a/nixosConfigurations/muede-pc2/default.nix
+++ b/nixosConfigurations/muede-pc2/default.nix
@@ -48,7 +48,7 @@
     ];
 
     my.constellation-swarm = {
-      enable = true;
+      enable = false;
       hiveName = "umbra";
     };
   };
diff --git a/nixosModules/constellation-swarm.nix b/nixosModules/constellation-swarm.nix
index 3388899..4423b90 100644
--- a/nixosModules/constellation-swarm.nix
+++ b/nixosModules/constellation-swarm.nix
@@ -37,18 +37,33 @@ in
       name = "constellation";
       domain = "constellation.darkest.space";
       enableRequiredServices = true;
-      forge.ci.enable = true;
-      peers = {
-      "umbra.darkest.space" = {
-        certFingerprint = "sha256:ae68d089e0155978fff7a9963bfb1e123ed645e7c9f93a4b4bb3e278c5f32a27";
+      forge = {
+        # not default - still on hive domain
+        domain = "forge.pr1ma.darkest.space";
+        ci = {
+          enable = true;
+          concurrency = 2;
+        };
       };
-      "pr1ma.darkest.space" = {
-        certFingerprint = "sha256:63e026f8682d6b5496f3eec99edb2ef62a8999c6d767228051e6e057f8cd90c6";
+      matrix = {
+        # not default - both still on hive domain
+        gatewayHost = "matrix.pr1ma.darkest.space";
+        serverName = "pr1ma.darkest.space";
+      };
+      hives = {
+        "umbra" = {
+          # not default - still not subdomain
+          domain = "umbra.darkest.space";
+          certFingerprint = "sha256:ae68d089e0155978fff7a9963bfb1e123ed645e7c9f93a4b4bb3e278c5f32a27";
+        };
+        "pr1ma" = {
+          # not default - still not subdomain
+          domain = "pr1ma.darkest.space";
+          certFingerprint = "sha256:63e026f8682d6b5496f3eec99edb2ef62a8999c6d767228051e6e057f8cd90c6";
+        };
       };
-    };
     };
     ruthless = true;
-    domain = "${cfg.hiveName}.darkest.space"; # backcompat not a subdomain
     hiveName = cfg.hiveName;
     gateway = {
       localHostsEntry = true;