diff --git a/3rdparty/docker/bootstrap/Dockerfile b/3rdparty/docker/bootstrap/Dockerfile
index 78f071a620..e5d2d43c24 100644
--- a/3rdparty/docker/bootstrap/Dockerfile
+++ b/3rdparty/docker/bootstrap/Dockerfile
@@ -11,7 +11,7 @@ RUN apt-get install -y git nasm autoconf automake autopoint texinfo \
 	u-boot-tools util-linux device-tree-compiler bc
 
 # GCC requirements
-RUN apt-get install -y python
+RUN apt-get install -y python3
 # zlib requirements
 RUN apt-get install -y cmake
 # ICU requirements
diff --git a/3rdparty/docker/bootstrap/Dockerfile.fedora b/3rdparty/docker/bootstrap/Dockerfile.fedora
index 3d42e13df9..ebb5f2faa5 100644
--- a/3rdparty/docker/bootstrap/Dockerfile.fedora
+++ b/3rdparty/docker/bootstrap/Dockerfile.fedora
@@ -11,7 +11,7 @@ RUN dnf install -y git nasm texinfo flex bison wget uboot-tools \
 	glibc-headers glibc-devel.x86_64 glibc-devel.i686
 
 # GCC requirements
-RUN dnf install -y python
+RUN dnf install -y python3
 # zlib requirements
 RUN dnf install -y cmake
 # ICU requirements
diff --git a/3rdparty/docker/bootstrap/Makefile b/3rdparty/docker/bootstrap/Makefile
index 271403a1d6..986525f892 100644
--- a/3rdparty/docker/bootstrap/Makefile
+++ b/3rdparty/docker/bootstrap/Makefile
@@ -13,10 +13,10 @@ clean:
 	${ENGINE} ps -a -q --filter=ancestor=docker.io/haiku/bootstrap | xargs -I {} ${ENGINE} rm {}
 	${ENGINE} volume rm bootstrap_work
 prep:
-	${ENGINE} run -v bootstrap_work:/work ${EXTRA} docker.io/haiku/bootstrap prep
+	${ENGINE} run -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap prep
 crosstools:
-	${ENGINE} run -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work ${EXTRA} docker.io/haiku/bootstrap crosstools
+	${ENGINE} run -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap crosstools
 bootstrap:
-	${ENGINE} run -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work ${EXTRA} docker.io/haiku/bootstrap bootstrap
+	${ENGINE} run -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap bootstrap
 enter:
-	${ENGINE} run -it -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work ${EXTRA} docker.io/haiku/bootstrap /bin/bash -l
+	${ENGINE} run -it -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap /bin/bash -l