diff --git a/client/hooks/pre_build b/client/hooks/pre_build
index e897d80d..7b443485 100755
--- a/client/hooks/pre_build
+++ b/client/hooks/pre_build
@@ -2,7 +2,11 @@
 
 export DOCKER_CLI_EXPERIMENTAL=enabled
 export DOCKER_BUILDKIT=1
+docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+docker buildx rm builder
 docker buildx create \
+	--name builder \
+	--driver docker-container \
 	--platform linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6 \
 	--use
 docker buildx inspect --bootstrap
diff --git a/server/hooks/pre_build b/server/hooks/pre_build
index e897d80d..7b443485 100755
--- a/server/hooks/pre_build
+++ b/server/hooks/pre_build
@@ -2,7 +2,11 @@
 
 export DOCKER_CLI_EXPERIMENTAL=enabled
 export DOCKER_BUILDKIT=1
+docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+docker buildx rm builder
 docker buildx create \
+	--name builder \
+	--driver docker-container \
 	--platform linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6 \
 	--use
 docker buildx inspect --bootstrap