diff --git a/.github/workflows/build-servers.yml b/.github/workflows/build-servers.yml
new file mode 100644
index 00000000..fab1567f
--- /dev/null
+++ b/.github/workflows/build-servers.yml
@@ -0,0 +1,63 @@
+name: Build 🏗️ Servers ️💁
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'flake.lock'
+  workflow_dispatch:
+
+jobs:
+  build-host:
+    runs-on: blacksmith-2vcpu-ubuntu-2204
+    strategy:
+      matrix:
+        host:
+          - malak
+          - revan
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+    - uses: actions/checkout@v4
+    - uses: DeterminateSystems/nix-installer-action@v16
+      with:
+        determinate: true
+    - uses: DeterminateSystems/magic-nix-cache-action@v8
+    - name: Building 👷 ${{ matrix.host }} 🐧
+      run: |
+        # Disable non-redist packages
+        for NON_REDIST in cider pico8; do
+          if [ -d "pkgs/${NON_REDIST}" ]; then
+            mv -v "pkgs/${NON_REDIST}" "pkgs/${NON_REDIST}-disabled"
+            mv -v pkgs/${NON_REDIST}-ci pkgs/${NON_REDIST}
+          fi
+        done
+        nix build .#nixosConfigurations.${{ matrix.host }}.config.system.build.toplevel -L
+  build-home:
+    runs-on: blacksmith-2vcpu-ubuntu-2204
+    strategy:
+      matrix:
+        home:
+          - martin@malak
+          - martin@revan
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+    - uses: actions/checkout@v4
+    - uses: DeterminateSystems/nix-installer-action@v16
+      with:
+        determinate: true
+    - uses: DeterminateSystems/magic-nix-cache-action@v8
+    - name: Building 👷 ${{ matrix.home }} 🏠
+      run: |
+        # Disable non-redist packages
+        for NON_REDIST in cider pico8; do
+          if [ -d "pkgs/${NON_REDIST}" ]; then
+            mv -v "pkgs/${NON_REDIST}" "pkgs/${NON_REDIST}-disabled"
+            mv -v pkgs/${NON_REDIST}-ci pkgs/${NON_REDIST}
+          fi
+        done
+        nix run nixpkgs#home-manager -- build --flake .#${{ matrix.home }} -L
diff --git a/.github/workflows/build-configs.yml b/.github/workflows/build-workstations.yml
similarity index 93%
rename from .github/workflows/build-configs.yml
rename to .github/workflows/build-workstations.yml
index 234ffe54..82c719f4 100644
--- a/.github/workflows/build-configs.yml
+++ b/.github/workflows/build-workstations.yml
@@ -1,4 +1,4 @@
-name: Build 🏗️ Configs ️❄️
+name: Build 🏗️ Workstations ️️🖥️
 
 on:
   push:
@@ -14,9 +14,7 @@ jobs:
     strategy:
       matrix:
         host:
-          - malak
           - phasma
-          - revan
           - vader
     permissions:
       contents: read
@@ -42,9 +40,7 @@ jobs:
     strategy:
       matrix:
         home:
-          - martin@malak
           - martin@phasma
-          - martin@revan
           - martin@vader
     permissions:
       contents: read