diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e5998327..8a1bba46 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,7 +28,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        machine: [caliban]
+        machine:
+          - caliban.nixos.org
+          - elated-minsky
+          - sleepy-brown
     steps:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v30
@@ -36,12 +39,14 @@ jobs:
         with:
           name: nixos-infra-dev
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-      - run: nix run --inputs-from . nixpkgs#nix-fast-build -- --skip-cached --no-nom --flake '.#nixosConfigurations."${{ matrix.machine }}.nixos.org".config.system.build.toplevel'
+      - run: nix run --inputs-from . nixpkgs#nix-fast-build -- --skip-cached --no-nom --flake '.#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel'
   nixos-aarch64:
     runs-on: ubuntu-22.04-arm
     strategy:
       matrix:
-        machine: [umbriel]
+        machine:
+          - umbriel.nixos.org
+          - goofy-hopcroft
     steps:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v30
@@ -49,12 +54,14 @@ jobs:
         with:
           name: nixos-infra-dev
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-      - run: nix run --inputs-from . nixpkgs#nix-fast-build -- --skip-cached --no-nom --flake '.#nixosConfigurations."${{ matrix.machine }}.nixos.org".config.system.build.toplevel'
+      - run: nix run --inputs-from . nixpkgs#nix-fast-build -- --skip-cached --no-nom --flake '.#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel'
   nix-darwin:
     runs-on: macos-latest
     strategy:
       matrix:
-        machine: [m1, m2-large]
+        machine:
+          - m1
+          - m2-large
     steps:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v30