diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index a2d4a013..2c4423fa 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -1,15 +1,34 @@
 name: Publish Docker
-on: [push]
-jobs: 
-  build:
+
+on: 
+  push:
+        branches: 
+        - 'arm-docker'
+jobs:
+  docker:
     runs-on: ubuntu-latest
     steps:
-        - uses: actions/checkout@master
-        - name: Publish to Registry
-          uses: elgohr/Publish-Docker-Github-Actions@master
-          with:
-              name: nusak/netmaker
-              username: ${{ secrets.DOCKER_USERNAME }}
-              password: ${{ secrets.DOCKER_PASSWORD }}
-              default_branch: arm_docker
-              platforms: linux/amd64, linux/arm64
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64, linux/arm64, linux/arm7
+          push: true
+          tags: nusak/netmaker:latest
+