diff --git a/Makefile b/Makefile
index 723e946..d552f84 100644
--- a/Makefile
+++ b/Makefile
@@ -13,17 +13,25 @@ MCP_IMAGE_NAME ?= mcp
 LOCALARCH ?= $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/')
 
 DOCKER_BUILDER ?= docker buildx
-DOCKER_BUILD_ARGS ?= --progress=plain --builder $(BUILDX_BUILDER_NAME) --pull --load --platform linux/$(LOCALARCH)
+DOCKER_BUILD_ARGS ?= --progress=plain  --pull --load --platform linux/$(LOCALARCH)
 
 BUILDX_NO_DEFAULT_ATTESTATIONS=1
 BUILDX_BUILDER_NAME=kagent-builder
 
+.PHONY: create-builder
+create-builder:
+	docker buildx inspect $(BUILDX_BUILDER_NAME)  || \
+	docker buildx create --name $(BUILDX_BUILDER_NAME) --platform linux/amd64,linux/arm64 --driver docker-container --use
+
 # Build the MCP image
 .PHONY: build-mcp
-build-mcp:
-	$(DOCKER_BUILDER) build $(DOCKER_BUILD_ARGS) -t $(DOCKER_REGISTRY)/$(DOCKER_REPO)/$(MCP_IMAGE_NAME):$(VERSION)  -f mcp/Dockerfile ./mcp
+build-mcp: create-builder
+	$(DOCKER_BUILDER) build $(DOCKER_BUILD_ARGS) --builder $(BUILDX_BUILDER_NAME) -t $(DOCKER_REGISTRY)/$(DOCKER_REPO)/$(MCP_IMAGE_NAME):$(VERSION)  -f mcp/Dockerfile ./mcp
 
 # Run the MCP image
 .PHONY: run-mcp
 run-mcp: build-mcp
 	docker run --rm -t  -e OPENAI_API_KEY=$(OPENAI_API_KEY) -e TRANSPORT_TYPE=http --name mcp -p 3001:3001 $(DOCKER_REGISTRY)/$(DOCKER_REPO)/$(MCP_IMAGE_NAME):$(VERSION)
+
+##  To test the MCP image locally
+#    docker run --rm -t -e OPENAI_API_KEY=$OPENAI_API_KEY -e TRANSPORT_TYPE=http -p 3001:3001 ghcr.io/kagent-dev/doc2vec/mcp:1.1.6