diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
index 3530813..48c5855 100644
--- a/.github/workflows/goreleaser.yml
+++ b/.github/workflows/goreleaser.yml
@@ -23,6 +23,12 @@ jobs:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
@@ -74,4 +80,4 @@ jobs:
           body: Automated changes by Release workflow in streamnative/streamnative-mcp-server repository.
           delete-branch: true
           committer: StreamNative Bot <streamnativebot@streamnative.io>
-          commit-message: Created by streamnative-mcp-server-release-workflow
\ No newline at end of file
+          commit-message: Created by streamnative-mcp-server-release-workflow
diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 0a83f9d..72b1fbb 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -36,6 +36,12 @@ jobs:
       - name: Docker login
         run: docker login -u="${{ secrets.DOCKER_USER }}" -p="${{ secrets.DOCKER_PASSWORD }}"
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Run GoReleaser (snapshot)
         uses: goreleaser/goreleaser-action@v3
         with:
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 0d4afdf..c173cce 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -56,24 +56,36 @@ dockers:
     dockerfile: Dockerfile.goreleaser
     goos: linux
     goarch: amd64
+    use: buildx
+    build_flag_templates:
+      - "--platform=linux/amd64"
   - image_templates:
       - "streamnative/snmcp:{{ .Tag }}-arm64"
       - "streamnative/snmcp:latest-arm64"
     dockerfile: Dockerfile.goreleaser
     goos: linux
     goarch: arm64
+    use: buildx
+    build_flag_templates:
+      - "--platform=linux/arm64"
   - image_templates:
       - "streamnative/mcp-server:{{ .Tag }}-amd64"
       - "streamnative/mcp-server:latest-amd64"
     dockerfile: Dockerfile.goreleaser
     goos: linux
     goarch: amd64
+    use: buildx
+    build_flag_templates:
+      - "--platform=linux/amd64"
   - image_templates:
       - "streamnative/mcp-server:{{ .Tag }}-arm64"
       - "streamnative/mcp-server:latest-arm64"
     dockerfile: Dockerfile.goreleaser
     goos: linux
     goarch: arm64
+    use: buildx
+    build_flag_templates:
+      - "--platform=linux/arm64"
 
 docker_manifests:
   - name_template: "streamnative/snmcp:{{ .Tag }}"
@@ -105,4 +117,4 @@ brews:
     directory: Formula
     homepage: "https://streamnative.io/"
     description: "StreamNative MCP Server (snmcp)"
-    license: "Apache-2.0"
\ No newline at end of file
+    license: "Apache-2.0"