diff --git a/.github/workflows/docker-hub.yaml b/.github/workflows/docker-hub.yaml
new file mode 100644
index 0000000..c2aaae6
--- /dev/null
+++ b/.github/workflows/docker-hub.yaml
@@ -0,0 +1,38 @@
+name: Build and Publish Docker Image (Multi-Arch)
+
+on:
+  workflow_dispatch:
+
+env:
+  IMAGE_NAME: rbehzadan/wireguard-3proxy
+  IMAGE_TAG: ${{ github.event.release.tag_name }}
+
+jobs:
+  build-and-publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ${{ env.IMAGE_NAME }}:latest
+            ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
+
diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/ghcr.yaml
similarity index 100%
rename from .github/workflows/build-and-push.yaml
rename to .github/workflows/ghcr.yaml