diff --git a/.github/workflows/build-push-master.yml b/.github/workflows/build-push-master.yml
index b5772fc..34f2149 100644
--- a/.github/workflows/build-push-master.yml
+++ b/.github/workflows/build-push-master.yml
@@ -30,18 +30,20 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      # build, lint, test, test-run first, to fail early
       - run: npm ci
       - run: npm run lint
       - run: npm test
       - run: npm run start
 
-      # - name: Set up QEMU
-      #   uses: docker/setup-qemu-action@v2
+      # ✅ Setup QEMU für ARM Builds
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
 
-      # - name: Set up Docker Buildx
-      #   uses: docker/setup-buildx-action@v2
+      # ✅ Setup Buildx für Multiarch
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
+      # ✅ Login zum GHCR
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:
@@ -54,18 +56,19 @@ jobs:
         uses: jaywcjlove/github-action-package@main
 
       - name: preparing variales to be lowercase
-        run: |
-          echo IMAGE_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
+        run: echo "IMAGE_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
 
-      - name: Build and push Docker image
+      - name: 🏗️ Build and push Docker image (Multiarch)
         uses: docker/build-push-action@v5
         with:
           context: .
           push: true
-          tags: '${{ env.REGISTRY }}/${{ env.IMAGE_REPOSITORY }}:${{ env.BRANCH_NAME }},${{ env.REGISTRY }}/${{ env.IMAGE_REPOSITORY }}:${{ steps.meta.outputs.version }},${{ env.REGISTRY }}/${{ env.IMAGE_REPOSITORY }}:${{ env.COMMIT_SHA }},${{ env.REGISTRY }}/${{ env.IMAGE_REPOSITORY }}:latest'
-          # tags: ${{ steps.meta.outputs.tags }}  #TAG from metadata-action
-          # labels: ${{ steps.meta.outputs.labels }} #TAG from metadata-action
-          # platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.IMAGE_REPOSITORY }}:${{ env.BRANCH_NAME }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_REPOSITORY }}:${{ steps.meta.outputs.version }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_REPOSITORY }}:${{ env.COMMIT_SHA }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_REPOSITORY }}:latest
 
       # - name: Trigger Re-Deploy Stage
       #   env: