diff --git a/Dockerfile b/Dockerfile
index c834b7a..ae43303 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,6 @@ FROM gitea.fithwum.tech/fithwum/debian-base:bullseye
 
 ARG VERSION
 ENV DEBIAN_FRONTEND=noninteractive
-WORKDIR /builder
 
 RUN apt-get update && apt-get install -y \
     debootstrap wget curl bash ftp-upload dirmngr locales sudo git bzip2 \
diff --git a/base-image-script/bootstrap-rootfs.sh b/base-image-script/bootstrap-rootfs.sh
index f6062c2..fc0df92 100644
--- a/base-image-script/bootstrap-rootfs.sh
+++ b/base-image-script/bootstrap-rootfs.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 DEBIAN_RELEASE="${VERSION:-}"
 ROOTFS_DIR="debian-${DEBIAN_RELEASE}"
 OUTPUT_DIR="/output"
-TARBALL="${OUTPUT_DIR}/debian-${DEBIAN_RELEASE}.tar.bz2"
+TARBALL="${OUTPUT_DIR}/$DEBIAN_RELEASE/debian-${DEBIAN_RELEASE}.tar.bz2"
 
 echo "[INFO] Bootstrapping Debian $DEBIAN_RELEASE rootfs..."
 apt-get update