diff --git a/Makefile b/Makefile
index 21545928d..a5063cf94 100644
--- a/Makefile
+++ b/Makefile
@@ -197,7 +197,6 @@ clean:
 	rm -rf storage/cache
 	rm -rf frontend/node_modules
 docker-development:
-	scripts/install-qemu.sh
 	docker pull --platform=amd64 ubuntu:21.10
 	docker pull --platform=arm64 ubuntu:21.10
 	docker pull --platform=arm ubuntu:21.10
diff --git a/scripts/deploy-preview.sh b/scripts/deploy-preview.sh
index 18c448bf6..596a41820 100755
--- a/scripts/deploy-preview.sh
+++ b/scripts/deploy-preview.sh
@@ -6,9 +6,7 @@ set -e
 scripts/test.sh
 
 # Build images
-scripts/install-qemu.sh
-sleep 2
 make docker-preview
 sleep 2
 docker pull photoprism/photoprism:preview
-make docker-demo
\ No newline at end of file
+make docker-demo
diff --git a/scripts/deploy-release.sh b/scripts/deploy-release.sh
new file mode 100755
index 000000000..f3e3309e3
--- /dev/null
+++ b/scripts/deploy-release.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -e
+
+# Run tests
+scripts/test.sh
+
+# Build images
+make docker-release
diff --git a/scripts/docker-buildx.sh b/scripts/docker-buildx.sh
index 0b73a3e94..c38fb1342 100755
--- a/scripts/docker-buildx.sh
+++ b/scripts/docker-buildx.sh
@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-set -e
-
 # https://docs.docker.com/develop/develop-images/build_enhancements/#to-enable-buildkit-builds
 export DOCKER_BUILDKIT=1
 
@@ -10,9 +8,12 @@ if [[ -z $1 ]] || [[ -z $2 ]]; then
     exit 1
 fi
 
-echo "Recreating multibuilder..."
-docker buildx rm multibuilder 2>/dev/null || true
-docker buildx create --name multibuilder --use
+echo "Removing existing multibuilder..."
+docker buildx rm multibuilder 2>/dev/null
+sleep 3
+scripts/install-qemu.sh || { echo 'failed'; exit 1; }
+sleep 3
+docker buildx create --name multibuilder --use  || { echo 'failed'; exit 1; }
 
 if [[ $1 ]] && [[ $2 ]] && [[ -z $3 ]]; then
     echo "Building 'photoprism/$1:preview'..."
@@ -37,6 +38,6 @@ else
 fi
 
 echo "Removing multibuilder..."
-docker buildx rm multibuilder 2>/dev/null || true
+docker buildx rm multibuilder
 
 echo "Done"