diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index c835651..4b32f49 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -19,11 +19,12 @@ env:
   DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
   VERSIONS: "buster bullseye bookworm"
   OUTPUT_DIR: /mnt/unraid_output/act_runner_output
-  # OUTPUT_DIR: /output
 
 jobs:
-  build-rootfs-archives:
+  build-and-push-rootfs-archives:
     runs-on: docker-build
+    outputs:
+      archives_changed: ${{ steps.commit_archives.outputs.archives_changed }}
     steps:
       - name: Checkout source
         uses: actions/checkout@v3
@@ -41,7 +42,7 @@ jobs:
             fithwum/debian-buster-base \
             bash -c "ls -lah /output; touch /output/test_debug && ls -lah /output"
 
-      - name: Check host output
+      - name: Check host output (repeat)
         run: |
           mkdir -p "${{ env.OUTPUT_DIR }}"
           touch "${{ env.OUTPUT_DIR }}"/test_from_vm
@@ -63,22 +64,6 @@ jobs:
             echo "[INFO] Building $version..."
             docker build --build-arg VERSION=$version -t fithwum/debian-$version-base .
 
-            # docker run --rm --privileged \
-            #   -v "${{ env.OUTPUT_DIR }}:/output" \
-            #   -e VERSION="$version" \
-            #   fithwum/debian-$version-base \
-            #   bash -eux -c '
-            #     echo "[DEBUG] Inside container, version: $VERSION"
-            #     echo "[DEBUG] Output dir contents BEFORE:"
-            #     ls -lah /output
-
-            #     echo "[DEBUG] Running bootstrap-rootfs.sh"
-            #     /scripts/bootstrap-rootfs.sh "$VERSION"
-
-            #     echo "[DEBUG] Output dir contents AFTER:"
-            #     find /output
-            #   '
-
             docker run --rm --privileged \
               -v "${{ env.OUTPUT_DIR }}:/output" \
               -e VERSION="$version" \
@@ -99,19 +84,6 @@ jobs:
             fi
           done
 
-      # - name: Clean up Docker cache (optional)
-      #   if: always()
-      #   run: docker system prune -af || true
-
-  push-archives-to-repo:
-    needs: build-rootfs-archives
-    runs-on: docker-build
-    outputs:
-      archives_changed: ${{ steps.commit_archives.outputs.archives_changed }}
-    steps:
-      - name: Checkout source
-        uses: actions/checkout@v3
-
       - name: Clone upload repo
         run: |
           git clone "https://${{ env.GIT_USERNAME }}:${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}@gitea.fithwum.tech/fithwum/debian-base.git" upload-repo
@@ -164,8 +136,8 @@ jobs:
           fi
 
   build-and-push-docker-images:
-    needs: push-archives-to-repo
-    if: needs.push-archives-to-repo.outputs.archives_changed == 'true'
+    needs: build-and-push-rootfs-archives
+    if: needs.build-and-push-rootfs-archives.outputs.archives_changed == 'true'
     runs-on: docker-build
     steps:
       - name: Checkout source