diff --git a/build-base/build.sh b/build-base/build.sh
index 2ba2c90..ab6088a 100755
--- a/build-base/build.sh
+++ b/build-base/build.sh
@@ -4,10 +4,15 @@ set -euo pipefail
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
+PROJECT="dropshell-build-base"
+
 # Create buildx builder if it doesn't exist
-docker buildx create --name multiarch --use \
-  --driver-opt env.BUILDKIT_MAX_PARALLELISM=4 \
-  2>/dev/null || docker buildx use multiarch
+if ! docker buildx ls | grep -q "${PROJECT}-multiarch"; then
+    docker buildx create --name ${PROJECT}-multiarch --use \
+        --driver-opt env.BUILDKIT_MAX_PARALLELISM=4
+else
+    docker buildx use ${PROJECT}-multiarch
+fi
 
 # Build multi-platform image and push it
 docker buildx build \