diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index 5ace6af..d3b380f 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -130,7 +130,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Create output directory
-        run: mkdir -p ${{ env.OUTPUT_DIR }}/${{ matrix.version }}
+        run: mkdir -p ${{ env.OUTPUT_DIR }}
 
       - name: Build rootfs Docker image
         run: |
@@ -142,15 +142,14 @@ jobs:
       - name: Run rootfs bootstrap
         run: |
           VERSION=${{ matrix.version }}
-          OUTPUT_DIR=${{ env.OUTPUT_DIR }}/$VERSION
 
           docker run --rm --privileged \
-            -v "$PWD/$OUTPUT_DIR:/output" \
+            -e VERSION="$VERSION" \
+            -v "$PWD/${{ env.OUTPUT_DIR }}:/output" \
             rootfs-$VERSION \
-            bash -c "/scripts/bootstrap-rootfs.sh $VERSION /output"
+            bash /scripts/bootstrap-rootfs.sh
 
-          # Verify tarball exists
-          TAR="$OUTPUT_DIR/debian-$VERSION.tar.bz2"
+          TAR="${{ env.OUTPUT_DIR }}/debian-$VERSION.tar.bz2"
           if [[ ! -f "$TAR" ]]; then
             echo "[ERROR] Rootfs tarball missing: $TAR"
             exit 1
@@ -166,15 +165,12 @@ jobs:
       - name: Update archive + sha256
         run: |
           VERSION=${{ matrix.version }}
-          OUTPUT_DIR=${{ env.OUTPUT_DIR }}/$VERSION
 
           mkdir -p upload/$VERSION
-          cp "$OUTPUT_DIR/debian-$VERSION.tar.bz2" upload/$VERSION/
+          cp "${{ env.OUTPUT_DIR }}/debian-$VERSION.tar.bz2" upload/$VERSION/
 
           cd upload
-          # Remove old checksum for this version
           sed -i "/debian-$VERSION.tar.bz2/d" sha256sums.txt 2>/dev/null || true
-          # Add new checksum
           sha256sum "$VERSION/debian-$VERSION.tar.bz2" >> sha256sums.txt
 
       - name: Commit if changed
@@ -191,6 +187,7 @@ jobs:
             git push
           else
             echo "[INFO] No changes for $VERSION"
+          fi
 
   # build-and-push-docker-images:
   #   needs: build-and-push-rootfs-archives