diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ab3b9992..6b2c0412 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -77,8 +77,8 @@ jobs:
       fail-fast: false
       matrix:
         machine:
-          - m1
-          - m2-large
+          - intense-heron # m1
+          - kind-lumiere # m2
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
         with:
diff --git a/macs/flake-module.nix b/macs/flake-module.nix
index 0dcc89d7..f4187ca5 100644
--- a/macs/flake-module.nix
+++ b/macs/flake-module.nix
@@ -2,19 +2,30 @@
 {
   flake.darwinConfigurations =
     let
-      mac =
-        system: entrypoint:
+      mkNixDarwin =
+        localHostName: entrypoint:
         inputs.darwin.lib.darwinSystem {
-          inherit system;
+          system = "aarch64-darwin";
 
           modules = [
+            {
+              networking = { inherit localHostName; };
+            }
             ./common.nix
             entrypoint
           ];
         };
     in
     {
-      m1 = mac "aarch64-darwin" ./profiles/m1.nix;
-      m2-large = mac "aarch64-darwin" ./profiles/m2.large.nix;
+      # M1 8C, 16G, 256G (Hetzner)
+      enormous-catfish = mkNixDarwin "enormous-catfish" ./profiles/m1.nix;
+      growing-jennet = mkNixDarwin "growing-jennet" ./profiles/m1.nix;
+      intense-heron = mkNixDarwin "intense-heron" ./profiles/m1.nix;
+      maximum-snail = mkNixDarwin "maximum-snail" ./profiles/m1.nix;
+      sweeping-filly = mkNixDarwin "sweeping-filly" ./profiles/m1.nix;
+
+      # M2 8C, 24G, 1TB (Oakhost)
+      eager-heisenberg = mkNixDarwin "eager-heisenberg" ./profiles/m2.large.nix;
+      kind-lumiere = mkNixDarwin "kind-lumiere" ./profiles/m2.large.nix;
     };
 }
diff --git a/macs/mac-update b/macs/mac-update
index 342ce950..59331199 100755
--- a/macs/mac-update
+++ b/macs/mac-update
@@ -5,16 +5,16 @@ PIDS=()
 update() {
 	local HOST=${1}
 	local PROFILE=${2}
-	(ssh "$HOST" -- sudo darwin-rebuild switch --flake "github:nixos/infra#$PROFILE" 2>&1| sed -e "s/^/${HOST} | /") &
+	(ssh "$HOST" -- sudo darwin-rebuild switch --flake "github:nixos/infra" 2>&1| sed -e "s/^/${HOST} | /") &
 	PIDS+=($!)
 }
 
-update hetzner@enormous-catfish.mac.nixos.org m1
-update hetzner@growing-jennet.mac.nixos.org m1
-update hetzner@intense-heron.mac.nixos.org m1
-update hetzner@maximum-snail.mac.nixos.org m1
-update hetzner@sweeping-filly.mac.nixos.org m1
-update customer@eager-heisenberg.mac.nixos.org m2-large
-update customer@kind-lumiere.mac.nixos.org m2-large
+update hetzner@enormous-catfish.mac.nixos.org
+update hetzner@growing-jennet.mac.nixos.org
+update hetzner@intense-heron.mac.nixos.org
+update hetzner@maximum-snail.mac.nixos.org
+update hetzner@sweeping-filly.mac.nixos.org
+update customer@eager-heisenberg.mac.nixos.org
+update customer@kind-lumiere.mac.nixos.org
 
 wait "${PIDS[@]}"