diff --git a/3rdparty/docker/bootstrap/Dockerfile b/3rdparty/docker/bootstrap/Dockerfile
index 13b232a65d..e86133deff 100644
--- a/3rdparty/docker/bootstrap/Dockerfile
+++ b/3rdparty/docker/bootstrap/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ENV DEBIAN_FRONTEND="noninteractive"
 
@@ -7,8 +7,8 @@ RUN apt-get update
 # Base Haiku requirements
 RUN apt-get install -y git nasm autoconf automake autopoint texinfo \
 	flex bison gawk build-essential unzip wget zip less zlib1g-dev \
-	libcurl4-openssl-dev genisoimage libtool mtools gcc-multilib \
-	u-boot-tools util-linux device-tree-compiler bc
+	libzstd-dev libcurl4-openssl-dev genisoimage libtool \
+	mtools gcc-multilib u-boot-tools util-linux device-tree-compiler bc
 
 # GCC requirements
 RUN apt-get install -y python3
diff --git a/3rdparty/docker/bootstrap/crosstools.sh b/3rdparty/docker/bootstrap/crosstools.sh
index 4d8f28e4ba..e6f0ca7330 100755
--- a/3rdparty/docker/bootstrap/crosstools.sh
+++ b/3rdparty/docker/bootstrap/crosstools.sh
@@ -21,7 +21,7 @@ mkdir -p $GENERATED
 echo "Beginning a bootstrap build for $TARGET_ARCH at $GENERATED..."
 
 cd $GENERATED
-$WORKPATH/src/haiku/configure -j4 --build-cross-tools $TARGET_ARCH $WORKPATH/src/buildtools \
+$WORKPATH/src/haiku/configure -j4 --build-cross-tools $TARGET_ARCH --cross-tools-source $WORKPATH/src/buildtools \
 	--bootstrap $WORKPATH/src/haikuporter/haikuporter $WORKPATH/src/haikuports.cross $WORKPATH/src/haikuports
 
 echo "If everything was successful, your next step is 'TARGET_ARCH=$TARGET_ARCH make bootstrap'"