diff --git a/GNUmakefile b/GNUmakefile
index 2d9f2de1c8..2b7ba980a3 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -176,7 +176,10 @@ remote-docker: check-remote-dev-image-env
 	@echo "Pulling consul container image - $(CONSUL_IMAGE_VERSION)"
 	@docker pull consul:$(CONSUL_IMAGE_VERSION) >/dev/null
 	@echo "Building and Pushing Consul Development container - $(REMOTE_DEV_IMAGE)"
-	@docker buildx use default && docker buildx build -t '$(REMOTE_DEV_IMAGE)' \
+	@if ! docker buildx inspect consul-builder; then \
+		docker buildx create --name consul-builder --driver docker-container --bootstrap; \
+	fi; 
+	@docker buildx use consul-builder && docker buildx build -t '$(REMOTE_DEV_IMAGE)' \
        --platform linux/amd64,linux/arm64 \
 	   --build-arg CONSUL_IMAGE_VERSION=$(CONSUL_IMAGE_VERSION) \
        --push \