diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index 2884c9a..c4ee78b 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -318,7 +318,7 @@ jobs:
 
   build-and-push-docker-images:
     name: Build & Push Docker Images (${{ matrix.version }})
-    needs: 
+    needs:
       - docker-prune
       - build-and-push-rootfs-archives
     if: ${{ needs.build-and-push-rootfs-archives.result == 'success' }}
@@ -338,7 +338,7 @@ jobs:
           CONTEXT_DIR="$VERSION"
           mkdir -p "$CONTEXT_DIR"
           echo "[INFO] Copying rootfs tarball into Docker context..."
-          cp "./output/debian-$VERSION.tar.bz2" "$CONTEXT_DIR/"
+          cp "./output/$VERSION/debian-$VERSION.tar.bz2" "$CONTEXT_DIR/"
 
       - name: Generate Dockerfile
         run: |
@@ -369,10 +369,16 @@ jobs:
           IMAGE_REPO=debian-base
           FULL_IMAGE="$IMAGE_REGISTRY/$IMAGE_ORG/$IMAGE_REPO:$VERSION"
 
+          TAR="./output/$VERSION/debian-$VERSION.tar.bz2"
+          if [[ ! -f "$TAR" ]]; then
+            echo "[ERROR] Rootfs tarball not found: $TAR"
+            exit 1
+          fi
+
           # Skip build if image already exists with same digest
           if docker pull "$FULL_IMAGE" >/dev/null 2>&1; then
             EXISTING_DIGEST=$(docker inspect --format='{{index .RepoDigests 0}}' "$FULL_IMAGE")
-            NEW_DIGEST=$(sha256sum "./$VERSION/debian-$VERSION.tar.bz2" | awk '{print $1}')
+            NEW_DIGEST=$(sha256sum "$TAR" | awk '{print $1}')
             if [[ "$EXISTING_DIGEST" == *"$NEW_DIGEST"* ]]; then
               echo "[INFO] Docker image for $VERSION is up-to-date, skipping build."
               exit 0