diff --git a/.github/workflows/build_and_push.yml b/.github/workflows/build_and_push.yml
index 49580227..c991e46f 100644
--- a/.github/workflows/build_and_push.yml
+++ b/.github/workflows/build_and_push.yml
@@ -11,8 +11,11 @@ on:
     types: [created]
 
 jobs:
-  build-and-push-docker:
+  build-and-push:
     runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        platform: ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/arm/v6"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -51,10 +54,7 @@ jobs:
           # Add :rc tag for pre-releases
           if [ "${{ github.event.release.prerelease }}" = "true" ]; then
             TAGS="${TAGS},freikin/dawarich:rc"
-          fi
-
-          # Add :latest tag only if release is not a pre-release
-          if [ "${{ github.event.release.prerelease }}" != "true" ]; then
+          else
             TAGS="${TAGS},freikin/dawarich:latest"
           fi
 
@@ -67,6 +67,6 @@ jobs:
           file: ./docker/Dockerfile.dev
           push: true
           tags: ${{ steps.docker_meta.outputs.tags }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
+          platforms: ${{ matrix.platform }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache