diff --git a/.forgejo/workflows/eval.yaml b/.forgejo/workflows/eval.yaml
index 7ebb568..106743e 100644
--- a/.forgejo/workflows/eval.yaml
+++ b/.forgejo/workflows/eval.yaml
@@ -9,96 +9,6 @@ on:
       - main
 
 jobs:
-  build_compute01:
-    runs-on: nix
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build compute01
-        run: |
-          # Enter the shell
-          nix-shell --run 'colmena build --on compute01'
-
-  build_storage01:
-    runs-on: nix
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build storage01
-        run: |
-          # Enter the shell
-          nix-shell --run 'colmena build --on storage01'
-
-  build_vault01:
-    runs-on: nix
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build vault01
-        run: |
-          # Enter the shell
-          nix-shell --run 'colmena build --on vault01'
-
-  build_web01:
-    runs-on: nix
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build web01
-        run: |
-          # Enter the shell
-          nix-shell --run 'colmena build --on web01'
-
-  build_web02:
-    runs-on: nix
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build web02
-        run: |
-          # Enter the shell
-          nix-shell --run 'colmena build --on web02'
-
-  build_rescue01:
-    runs-on: nix
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build rescue01
-        run: |
-          # Enter the shell
-          nix-shell --run 'colmena build --on rescue01'
-
-  build_geo01:
-    runs-on: nix
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build geo01
-        run: |
-          # Enter the shell
-          nix-shell --run 'colmena build --on geo01'
-
-  build_geo02:
-    runs-on: nix
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build geo02
-        run: |
-          # Enter the shell
-          nix-shell --run 'colmena build --on geo02'
-
-  build_bridge01:
-    runs-on: nix
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build bridge01
-        run: |
-          # Enter the shell
-          nix-shell --run 'colmena build --on bridge01'
-
   build_and_cache_krz01:
     runs-on: nix
     steps:
@@ -118,191 +28,173 @@ jobs:
           name: outputs_krz01
           path: paths.txt
 
-  push_to_cache_compute01:
+  build_and_cache_compute01:
     runs-on: nix
-    needs:
-      - build_compute01
     steps:
       - uses: actions/checkout@v3
 
-      - name: Push to cache
-        run: nix-shell --run push-to-nix-cache
+      - name: Build and cache the node
+        run: nix-shell --run cache-node
         env:
           STORE_ENDPOINT: "https://tvix-store.dgnum.eu/infra-signing/"
           STORE_USER: "admin"
           STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
-          NODES: '[ "compute01" ]'
+          BUILD_NODE: "compute01"
 
       - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: outputs_compute01
-          path: uploaded.txt
+          path: paths.txt
 
-  push_to_cache_storage01:
+  build_and_cache_storage01:
     runs-on: nix
-    needs:
-      - build_storage01
     steps:
       - uses: actions/checkout@v3
 
-      - name: Push to cache
-        run: nix-shell --run push-to-nix-cache
+      - name: Build and cache the node
+        run: nix-shell --run cache-node
         env:
           STORE_ENDPOINT: "https://tvix-store.dgnum.eu/infra-signing/"
           STORE_USER: "admin"
           STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
-          NODES: '[ "storage01" ]'
+          BUILD_NODE: "storage01"
 
       - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: outputs_storage01
-          path: uploaded.txt
+          path: paths.txt
 
-  push_to_cache_rescue01:
+  build_and_cache_rescue01:
     runs-on: nix
-    needs:
-      - build_rescue01
     steps:
       - uses: actions/checkout@v3
 
-      - name: Push to cache
-        run: nix-shell --run push-to-nix-cache
+      - name: Build and cache the node
+        run: nix-shell --run cache-node
         env:
           STORE_ENDPOINT: "https://tvix-store.dgnum.eu/infra-signing/"
           STORE_USER: "admin"
           STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
-          NODES: '[ "rescue01" ]'
+          BUILD_NODE: "rescue01"
 
       - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: outputs_rescue01
-          path: uploaded.txt
+          path: paths.txt
 
-  push_to_cache_geo01:
+  build_and_cache_geo01:
     runs-on: nix
-    needs:
-      - build_geo01
     steps:
       - uses: actions/checkout@v3
 
-      - name: Push to cache
-        run: nix-shell --run push-to-nix-cache
+      - name: Build and cache the node
+        run: nix-shell --run cache-node
         env:
           STORE_ENDPOINT: "https://tvix-store.dgnum.eu/infra-signing/"
           STORE_USER: "admin"
           STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
-          NODES: '[ "geo01" ]'
+          BUILD_NODE: "geo01"
 
       - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: outputs_geo01
-          path: uploaded.txt
+          path: paths.txt
 
-  push_to_cache_geo02:
+  build_and_cache_geo02:
     runs-on: nix
-    needs:
-      - build_geo02
     steps:
       - uses: actions/checkout@v3
 
-      - name: Push to cache
-        run: nix-shell --run push-to-nix-cache
+      - name: Build and cache the node
+        run: nix-shell --run cache-node
         env:
           STORE_ENDPOINT: "https://tvix-store.dgnum.eu/infra-signing/"
           STORE_USER: "admin"
           STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
-          NODES: '[ "geo02" ]'
+          BUILD_NODE: "geo02"
 
       - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: outputs_geo02
-          path: uploaded.txt
+          path: paths.txt
 
-  push_to_cache_vault01:
+  build_and_cache_vault01:
     runs-on: nix
-    needs:
-      - build_vault01
     steps:
       - uses: actions/checkout@v3
 
-      - name: Push to cache
-        run: nix-shell --run push-to-nix-cache
+      - name: Build and cache the node
+        run: nix-shell --run cache-node
         env:
           STORE_ENDPOINT: "https://tvix-store.dgnum.eu/infra-signing/"
           STORE_USER: "admin"
           STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
-          NODES: '[ "vault01" ]'
+          BUILD_NODE: "vault01"
 
       - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: outputs_vault01
-          path: uploaded.txt
+          path: paths.txt
 
-  push_to_cache_web01:
+  build_and_cache_web01:
     runs-on: nix
-    needs:
-      - build_web01
     steps:
       - uses: actions/checkout@v3
 
-      - name: Push to cache
-        run: nix-shell --run push-to-nix-cache
+      - name: Build and cache the node
+        run: nix-shell --run cache-node
         env:
           STORE_ENDPOINT: "https://tvix-store.dgnum.eu/infra-signing/"
           STORE_USER: "admin"
           STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
-          NODES: '[ "web01" ]'
+          BUILD_NODE: "web01"
 
       - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: outputs_web01
-          path: uploaded.txt
+          path: paths.txt
 
-  push_to_cache_web02:
+  build_and_cache_web02:
     runs-on: nix
-    needs:
-      - build_web02
     steps:
       - uses: actions/checkout@v3
 
-      - name: Push to cache
-        run: nix-shell --run push-to-nix-cache
+      - name: Build and cache the node
+        run: nix-shell --run cache-node
         env:
           STORE_ENDPOINT: "https://tvix-store.dgnum.eu/infra-signing/"
           STORE_USER: "admin"
           STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
-          NODES: '[ "web02" ]'
+          BUILD_NODE: "web02"
 
       - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: outputs_web02
-          path: uploaded.txt
+          path: paths.txt
 
-  push_to_cache_bridge01:
+  build_and_cache_bridge01:
     runs-on: nix
-    needs:
-      - build_bridge01
     steps:
       - uses: actions/checkout@v3
 
-      - name: Push to cache
-        run: nix-shell --run push-to-nix-cache
+      - name: Build and cache the node
+        run: nix-shell --run cache-node
         env:
           STORE_ENDPOINT: "https://tvix-store.dgnum.eu/infra-signing/"
           STORE_USER: "admin"
           STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
-          NODES: '[ "bridge01" ]'
+          BUILD_NODE: "bridge01"
 
       - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: outputs_web02
-          path: uploaded.txt
+          path: paths.txt