diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml
index bb76ea0..dd1b3a4 100644
--- a/.github/workflows/docker-push.yml
+++ b/.github/workflows/docker-push.yml
@@ -1,19 +1,44 @@
-name: Publish Docker image
+name: Push DockerHub CI
+
 on:
   release:
     types: [published]
-  workflow_dispatch: 
+  workflow_dispatch:
+
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     steps:
-      - name: Check out the repo
+
+      - name: Checkout
         uses: actions/checkout@v2
-      - name: Push to Docker Hub
-        uses: docker/build-push-action@v1
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            vibpsb/i-adhore
+          tags: |
+            type=ref,event=tag
+      
+      - name: Login to DockerHub
+        uses: docker/login-action@v1 
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: vibpsb/i-adhore
-          tags: latest
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Build and push to Docker Hub
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          platforms: linux/arm64,linux/amd64
+          context: .
+          tags: ${{ steps.meta.outputs.tags }}