diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7d02d2c7..2c70c0df 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -43,10 +43,11 @@ jobs:
         run: |
           aws s3 sync dist/upload s3://builds.loraserver.io/chirpstack-gateway-bridge
 
+  # Runs on pull request to ensure the docker build works,
+  # but pushes only on commits to master and on PRs.
   docker:
     needs: test
     runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/v')
     steps:
       -
         name: Checkout
@@ -57,7 +58,7 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: |
-            chirpstack/chirpstack-gateway-bridge
+            chirpstack/${{ github.event.repository.name }}
           tags: |
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}
@@ -70,6 +71,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
       -
         name: Login to DockerHub
+        if: startsWith(github.ref, 'refs/tags/v')
         uses: docker/login-action@v1 
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -79,8 +81,8 @@ jobs:
         id: docker_build
         uses: docker/build-push-action@v2
         with:
-          context: .
-          push: true
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
+          push: ${{ startsWith(github.ref, 'refs/tags/v') }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
       -