diff --git a/3rdparty/docker/bootstrap/Dockerfile b/3rdparty/docker/bootstrap/Dockerfile
index 328c157ed7..a7df4f3d5a 100644
--- a/3rdparty/docker/bootstrap/Dockerfile
+++ b/3rdparty/docker/bootstrap/Dockerfile
@@ -3,11 +3,16 @@ FROM debian
 ENV DEBIAN_FRONTEND="noninteractive"
 
 RUN apt-get update
+
+# Base Haiku requirements
 RUN apt-get install -y git nasm autoconf automake 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
 
+# GCC Requirements
+RUN apt-get install -y python
+
 ENV GIT_BUILDTOOLS="https://git.haiku-os.org/buildtools"
 ENV GIT_HAIKU="https://git.haiku-os.org/haiku"
 ENV GIT_HAIKUPORTER="https://github.com/haikuports/haikuporter.git"
diff --git a/3rdparty/docker/bootstrap/Makefile b/3rdparty/docker/bootstrap/Makefile
index 9355bef3cf..64c54aa2e7 100644
--- a/3rdparty/docker/bootstrap/Makefile
+++ b/3rdparty/docker/bootstrap/Makefile
@@ -1,7 +1,7 @@
 default:
 	docker build . -t docker.io/haiku/bootstrap
 clean:
-	docker rm docker.io/haiku/bootstrap
+	docker ps -a -q --filter=ancestor=docker.io/haiku/bootstrap | xargs -I {} docker rm {}
 	docker volume rm bootstrap_work
 init:
 	docker run -v bootstrap_work:/work docker.io/haiku/bootstrap prep
diff --git a/3rdparty/docker/bootstrap/crosstools.sh b/3rdparty/docker/bootstrap/crosstools.sh
index 51722c9970..4d8f28e4ba 100755
--- a/3rdparty/docker/bootstrap/crosstools.sh
+++ b/3rdparty/docker/bootstrap/crosstools.sh
@@ -24,4 +24,4 @@ cd $GENERATED
 $WORKPATH/src/haiku/configure -j4 --build-cross-tools $TARGET_ARCH $WORKPATH/src/buildtools \
 	--bootstrap $WORKPATH/src/haikuporter/haikuporter $WORKPATH/src/haikuports.cross $WORKPATH/src/haikuports
 
-echo "If everything was successful, your next step is 'make bootstrap'"
+echo "If everything was successful, your next step is 'TARGET_ARCH=$TARGET_ARCH make bootstrap'"