diff --git a/.github/workflows/tag.yaml b/.github/workflows/tag.yaml
index 6a47915..2f5349a 100644
--- a/.github/workflows/tag.yaml
+++ b/.github/workflows/tag.yaml
@@ -33,9 +33,13 @@ jobs:
       uses: docker/setup-qemu-action@v3
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
-
+      with:
+        platforms: linux/amd64,linux/arm64
+        version: v0.23.0
+        use: 'true'
     - name: 'Build Images'
       env:
+        BUILDX_BUILDER_NAME: kagent-builder-v0.23.0
         DOCKER_BUILD_ARGS: "--push --platform linux/amd64,linux/arm64"
         DOCKER_BUILDER: "docker buildx"
       run: |
@@ -66,7 +70,7 @@ jobs:
         else
           export VERSION=$(echo "$GITHUB_REF" | cut -c12-)
         fi
-        make build
+        make docker-build
     - name: Release
       uses: softprops/action-gh-release@v2
       if: startsWith(github.ref, 'refs/tags/')
diff --git a/Makefile b/Makefile
index c75a184..4946eed 100644
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,7 @@ buildx-create:
 
 .PHONY: docker-build  # build tools image
 docker-build: fmt buildx-create
-	$(DOCKER_BUILDER) build $(DOCKER_BUILD_ARGS) $(TOOLS_IMAGE_BUILD_ARGS) -f Dockerfile ./
+	$(DOCKER_BUILDER) build $(DOCKER_BUILD_ARGS) $(TOOLS_IMAGE_BUILD_ARGS) -t $(TOOLS_IMG) -f Dockerfile ./
 
 .PHONY: docker-build  # build tools image for amd64 and arm64
 docker-build-all: fmt buildx-create