diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index 751a0d0..74cee03 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -78,17 +78,18 @@ jobs:
                   umount -lf \"\$ROOTFS_DIR/\$dir\" 2>/dev/null || true
                 done
 
-                echo '[INFO] Creating compressed base image...'
-                TARBALL=\"/output/debian-\$DEBIAN_RELEASE.tar.bz2\"
-                tar -cjf \"\$TARBALL\" -C \"\$ROOTFS_DIR\" .
+                mkdir -p /output/$DEBIAN_RELEASE
+                TARBALL="/output/$DEBIAN_RELEASE/debian-${DEBIAN_RELEASE}.tar.bz2"
+                tar -cjf "$TARBALL" -C "$ROOTFS_DIR" .
                 echo '[INFO] Tarball ready for CI to upload: \$TARBALL'
               "
             done
 
       - name: List output archives
         run: |
-          echo "[INFO] Looking for tarballs in workspace..."
-          find . -name '*.tar.bz2' -exec ls -lh {} \;
+          echo "[INFO] Final archive list:"
+          find . -type f -path './*/debian-*.tar.bz2' -exec ls -lh {} \;
+
 
       # - name: Debug workspace contents
       #   run: |
@@ -115,7 +116,7 @@ jobs:
 
       - name: Copy new archives to upload-repo
         run: |
-          found=$(find . -name '*.tar.bz2')
+          found=$(find . -type f -path './*/debian-*.tar.bz2')
           if [ -z "$found" ]; then
             echo "[WARNING] No .tar.bz2 archive found!"
             exit 1