diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 7918695..cff873d 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -10,9 +10,6 @@ on:
         required: true
         type: string
 
-env:
-  IMAGE_NAME: iexechub/mcp-server
-
 jobs:
   publish-docker:
     runs-on: ubuntu-latest
@@ -20,42 +17,38 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
       - name: Get version
         id: version
         run: |
           if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
             VERSION="${{ github.event.inputs.version }}"
-          elif [ "${{ github.ref_type }}" = "tag" ]; then
-            VERSION=${GITHUB_REF_NAME#v}
           else
-            echo "Error: This workflow should only run on tags or workflow_dispatch"
-            exit 1
+            VERSION=${GITHUB_REF#refs/tags/v}
           fi
           echo "version=$VERSION" >> $GITHUB_OUTPUT
-          echo "Building Docker image for version: $VERSION"
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME}}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          echo "Publishing version: $VERSION"
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
           context: .
           push: true
-          platforms: linux/amd64,linux/arm64
           tags: |
-            ${{ env.IMAGE_NAME }}:${{ steps.version.outputs.version }}
-            ${{ env.IMAGE_NAME }}:latest
+            iexechub/mcp-server:latest
+            iexechub/mcp-server:mcp-server-v${{ steps.version.outputs.version }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-      - name: Success notification
+      - name: Success
         run: |
-          echo "✅ Docker image published: v${{ steps.version.outputs.version }}"
-          echo "🐳 https://hub.docker.com/r/${{ env.IMAGE_NAME }}"
+          echo "✅ Published Docker image v${{ steps.version.outputs.version }}"
+          echo "🐳 Docker Hub: https://hub.docker.com/r/iexechub/mcp-server"