diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 9fc7ded..1629402 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -25,18 +25,10 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
-        name: Build and push linux/amd64
+        name: Build and push
         uses: docker/build-push-action@v2
         with:
           context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
           push: true
-          tags: noisedash/noisedash:latest
-      -
-        name: Build and push linux/arm/v7
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          platforms: linux/arm/v7
-          push: true
-          tags: noisedash/noisedash:latest-armv7
+          tags: noisedash/noisedash:latest,noisedash/noisedash:${{ github.ref_name }}