diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index a88a090..71589fe 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -33,17 +33,19 @@ jobs:
             echo "[INFO] Building Debian $version rootfs..."
             docker build --build-arg VERSION=$version -t fithwum/debian-$version-base .
 
-            if [ "$version" == "trixie" ]; then
-              mkdir -p "$(pwd)/trixie"
-              docker run --rm --privileged \
-                -v "$(pwd)/trixie":/output \
-                fithwum/debian-$version-base \
-                bash base-image-script/debian-${version}_pt1.sh
-            else
-              docker run --rm --privileged \
-                -v "$(pwd)":/output \
-                fithwum/debian-$version-base \
-                bash base-image-script/debian-${version}_pt1.sh
+            docker run --rm --privileged \
+              -v "$(pwd)":/output \
+              fithwum/debian-$version-base \
+              bash base-image-script/debian-${version}_pt1.sh
+
+            # Auto-detect output tarball and move it if needed
+            expected_path="./$version/debian-$version.tar.bz2"
+            fallback_path="./debian-$version.tar.bz2"
+
+            if [ -f "$fallback_path" ] && [ ! -f "$expected_path" ]; then
+              mkdir -p "./$version"
+              mv "$fallback_path" "$expected_path"
+              echo "[INFO] Moved fallback tarball to expected path: $expected_path"
             fi
           done
 
diff --git a/bookworm/debian-bookworm.tar.bz2 b/bookworm/debian-bookworm.tar.bz2
deleted file mode 100644
index a6db7a1..0000000
Binary files a/bookworm/debian-bookworm.tar.bz2 and /dev/null differ
diff --git a/bullseye/debian-bullseye.tar.bz2 b/bullseye/debian-bullseye.tar.bz2
deleted file mode 100644
index e435663..0000000
Binary files a/bullseye/debian-bullseye.tar.bz2 and /dev/null differ
diff --git a/buster/debian-buster.tar.bz2 b/buster/debian-buster.tar.bz2
deleted file mode 100644
index a2053f8..0000000
Binary files a/buster/debian-buster.tar.bz2 and /dev/null differ
diff --git a/docker-build/debian-docker-build.tar.bz2 b/docker-build/debian-docker-build.tar.bz2
deleted file mode 100644
index 98043a5..0000000
Binary files a/docker-build/debian-docker-build.tar.bz2 and /dev/null differ
diff --git a/sha256sums.txt b/sha256sums.txt
deleted file mode 100644
index 39b1850..0000000
--- a/sha256sums.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-b308db0fd18ef00f33d7ba7573b1eca5fd785e50739f3de07ad14a7eb35594f4  bookworm/debian-bookworm.tar.bz2
-a3b40dc56eec450a5a64ee3e93eeb52aecc0de9966dbbfb6c059a0ae39b7d747  bullseye/debian-bullseye.tar.bz2
-b9f59ef623d846f3a34ab744ff5887917968db773fe90a419b42ead2739e49be  buster/debian-buster.tar.bz2
-d859d1e637512931e7d67488bc179776789eda809e9ddcafd421479df4fb2a61  docker-build/debian-docker-build.tar.bz2