diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index 6f640fe..985d6d3 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -25,23 +25,53 @@ jobs:
     steps:
       - name: Checkout source
         uses: actions/checkout@v3
+      
+      - name: Clean workspace tarballs before build
+        run: |
+          echo "[INFO] Cleaning old tarballs..."
+          rm -f ./debian-*.tar.bz2
+          rm -f ./rootfs-*.tar.bz2
+          rm -f ./sha256sums.txt
 
       - name: Build all Debian rootfs versions sequentially
         run: |
           versions=($VERSIONS)
 
           for version in "${versions[@]}"; do
+            echo "[INFO] Building $version..."
             docker build --build-arg VERSION=$version -t fithwum/debian-$version-base .
-            
+
             docker run --rm --privileged \
               -v "$(pwd)":/output \
               fithwum/debian-$version-base \
               bash base-image-script/debian-${version}_pt1.sh
 
-              echo "[DEBUG] Checking host output dir: ./$version"
-              ls -lh "./$version" || echo "[WARN] No folder or files in ./$version"
+            TARBALL="debian-${version}.tar.bz2"
+            if [ -f "$TARBALL" ]; then
+              mkdir -p "./$version"
+              mv "$TARBALL" "./$version/"
+              echo "[INFO] Moved $TARBALL to $version/"
+            else
+              echo "[ERROR] Expected tarball not found at ./$TARBALL"
+              exit 1
+            fi
+
+            echo "[DEBUG] Checking host output dir: ./$version"
+            ls -lh "./$version" || echo "[WARN] No folder or files in ./$version"
           done
 
+          # for version in "${versions[@]}"; do
+          #   docker build --build-arg VERSION=$version -t fithwum/debian-$version-base .
+            
+          #   docker run --rm --privileged \
+          #     -v "$(pwd)":/output \
+          #     fithwum/debian-$version-base \
+          #     bash base-image-script/debian-${version}_pt1.sh
+
+          #     echo "[DEBUG] Checking host output dir: ./$version"
+          #     ls -lh "./$version" || echo "[WARN] No folder or files in ./$version"
+          # done
+
       - name: List output archives
         run: |
           echo "[INFO] Looking for tarballs in workspace..."
diff --git a/base-image-script/debian-build_pt3.sh b/base-image-script/debian-build_pt3.sh
index 491ffc1..140896f 100644
--- a/base-image-script/debian-build_pt3.sh
+++ b/base-image-script/debian-build_pt3.sh
@@ -14,7 +14,7 @@ else
     fi
 fi
 
-TARBALL="/output/$DEBIAN_RELEASE/${ROOTFS_DIR}.tar.bz2"
+TARBALL="/output/${ROOTFS_DIR}.tar.bz2"
 
 echo "[INFO] Unmounting system directories (ignore errors)..."
 for dir in sys proc dev/pts dev; do