diff --git a/.github/workflows/build-host.yml b/.github/workflows/build-host.yml
new file mode 100644
index 0000000..392691a
--- /dev/null
+++ b/.github/workflows/build-host.yml
@@ -0,0 +1,30 @@
+name: Build host
+on:
+  workflow_call:
+    inputs:
+      hosts:
+        required: true
+        type: string
+    secrets:
+      CACHIX_AUTH_TOKEN:
+        required: true
+jobs:
+  build-host:
+    name: ${{ matrix.host }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        host: ${{ fromJson(inputs.hosts) }}
+    steps:
+      - uses: actions/checkout@v5
+      - uses: cachix/install-nix-action@v31
+        with:
+          extra_nix_config: experimental-features = nix-command flakes pipe-operators
+      - uses: cachix/cachix-action@v15
+        with:
+          name: sebastian-stork
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+          useDaemon: false
+      - name: Build host
+        run: nix build .#nixosConfigurations.${{ matrix.host }}.config.system.build.toplevel --print-build-logs
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7da36fe..ff94c51 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,20 +8,36 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       checks: ${{ steps.checks.outputs.checks }}
-      hosts: ${{ steps.hosts.outputs.hosts }}
+      servers: ${{ steps.servers.outputs.servers }}
+      workstations: ${{ steps.workstations.outputs.workstations }}
     steps:
       - uses: actions/checkout@v5
       - uses: cachix/install-nix-action@v31
         with:
           extra_nix_config: experimental-features = nix-command flakes pipe-operators
-      - id: checks
+      - name: Get checks
+        id: checks
         run: |
           checks=$(nix flake show --json | jq -c '.checks."x86_64-linux" | keys')
           printf "checks=%s" "$checks" >> "$GITHUB_OUTPUT"
-      - id: hosts
+      - name: Get servers
+        id: servers
         run: |
-          hosts=$(nix flake show --json | jq -c '.nixosConfigurations | keys')
-          printf "hosts=%s" "$hosts" >> "$GITHUB_OUTPUT"
+          servers=$(nix eval .#nixosConfigurations --apply 'configs:
+            configs
+            |> builtins.attrNames
+            |> builtins.filter (name: configs.${name}.config.custom.services.comin.enable)
+          ' --json)
+          printf "servers=%s" "$servers" >> "$GITHUB_OUTPUT"
+      - name: Get workstations
+        id: workstations
+        run: |
+          workstations=$(nix eval .#nixosConfigurations --apply 'configs:
+            configs
+            |> builtins.attrNames
+            |> builtins.filter (name: !configs.${name}.config.custom.services.comin.enable)
+          ' --json)
+          printf "workstations=%s" "$workstations" >> "$GITHUB_OUTPUT"
   build-check:
     needs: parse-flake
     runs-on: ubuntu-latest
@@ -39,43 +55,28 @@ jobs:
           name: sebastian-stork
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
           useDaemon: false
-      - run: nix build .#checks.x86_64-linux.${{ matrix.check }} --print-build-logs
-  build-host:
+      - name: Build check
+        run: nix build .#checks.x86_64-linux.${{ matrix.check }} --print-build-logs
+  build-server:
     needs: parse-flake
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        host: ${{ fromJson(needs.parse-flake.outputs.hosts) }}
-    steps:
-      - uses: actions/checkout@v5
-      - uses: cachix/install-nix-action@v31
-        with:
-          extra_nix_config: experimental-features = nix-command flakes pipe-operators
-      - uses: cachix/cachix-action@v15
-        with:
-          name: sebastian-stork
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-          useDaemon: false
-      - run: nix build .#nixosConfigurations.${{ matrix.host }}.config.system.build.toplevel --print-build-logs
-  flake-check:
-    needs: build-check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - uses: cachix/install-nix-action@v31
-        with:
-          extra_nix_config: experimental-features = nix-command flakes pipe-operators
-      - uses: cachix/cachix-action@v15
-        with:
-          name: sebastian-stork
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-      - run: nix flake check --keep-going --print-build-logs
+    uses: ./.github/workflows/build-host.yml
+    with:
+      hosts: ${{ needs.parse-flake.outputs.servers }}
+    secrets:
+      CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
+  build-workstation:
+    needs: parse-flake
+    uses: ./.github/workflows/build-host.yml
+    with:
+      hosts: ${{ needs.parse-flake.outputs.workstations }}
+    secrets:
+      CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
   deploy:
-    needs: [build-host, flake-check]
+    needs: [build-check, build-server]
     runs-on: ubuntu-latest
     permissions:
       contents: write
     steps:
       - uses: actions/checkout@v5
-      - run: git push origin HEAD:deploy --force
+      - name: Push to deploy branch
+        run: git push origin HEAD:deploy --force
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 75d0605..0cafcba 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -13,7 +13,8 @@ jobs:
       - uses: cachix/install-nix-action@v31
         with:
           extra_nix_config: experimental-features = nix-command flakes pipe-operators
-      - run: |
+      - name: Update and push
+        run: |
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           nix flake update --commit-lock-file