diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index 497f93b..9e0ae8e 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -31,30 +31,15 @@ jobs:
           versions=($VERSIONS)
 
           for version in "${versions[@]}"; do
-            echo "[INFO] Building Debian $version rootfs..."
             docker build --build-arg VERSION=$version -t fithwum/debian-$version-base .
-
-            mkdir -p "./$version"
             
             docker run --rm --privileged \
-              -v "$(pwd)/$version":/output \
+              -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"
-  
-              expected_path="./$version/debian-$version.tar.bz2"
-              fallback_path="./debian-$version.tar.bz2"
 
-              if [ -f "$fallback_path" ]; then
-                echo "[INFO] Found fallback tarball: $fallback_path"
-                mkdir -p "./$version"
-                mv "$fallback_path" "$expected_path"
-                echo "[INFO] Moved $fallback_path to $expected_path"
-              else
-                echo "[ERROR] Expected tarball not found at $fallback_path"
-                exit 1
-              fi
+              echo "[DEBUG] Checking host output dir: ./"
+              ls -lh "./$version" || echo "[WARN] No folder or files in ./$version"
           done
 
       - name: List output archives
diff --git a/base-image-script/debian-build_pt3.sh b/base-image-script/debian-build_pt3.sh
index 9a7c199..140896f 100644
--- a/base-image-script/debian-build_pt3.sh
+++ b/base-image-script/debian-build_pt3.sh
@@ -27,16 +27,10 @@ rm -f "$ROOTFS_DIR/root/${ROOTFS_DIR}_pt2.sh" 2>/dev/null || true
 echo "[INFO] Rootfs size:"
 du -sh "$ROOTFS_DIR"
 
-mkdir -p /output
-
 echo "[INFO] Creating compressed base image..."
 tar -cjf "$TARBALL" -C "$ROOTFS_DIR" .
 
 echo "[INFO] Image archive size:"
 du -sh "$TARBALL"
 
-# Debug listing output dir
-echo "[DEBUG] Listing /output:"
-ls -lh /output
-
 echo "[INFO] Tarball ready for CI to upload: $TARBALL"