diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml
index a79ea3c..e93defd 100644
--- a/.github/workflows/push-image.yml
+++ b/.github/workflows/push-image.yml
@@ -4,6 +4,9 @@ on:
     push:
         branches:
             - master
+    pull_request:
+        branches:
+            - master
 
 env:
     IMAGE_NAME: ${{ github.repository }}
@@ -29,6 +32,9 @@ jobs:
                   username: ${{ env.REGISTRY_USER }}
                   password: ${{ env.REGISTRY_PASSWORD }}
 
+            - name: Set up Docker Buildx
+              uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db
+
             - name: Extract metadata (tags, labels) for Docker (frontend)
               id: meta-frontend
               uses: docker/metadata-action@c4ee3adeed93b1fa6a762f209fb01608c1a22f1e
@@ -36,6 +42,12 @@ jobs:
                   images: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}
                   flavor: |
                       suffix=-frontend
+                  tags: |
+                      type=schedule
+                      type=ref,event=branch
+                      type=ref,event=tag
+                      type=ref,event=pr
+                      type=sha,format=long
 
             - name: Extract metadata (tags, labels) for Docker (backend)
               id: meta-backend
@@ -44,11 +56,18 @@ jobs:
                   images: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}
                   flavor: |
                       suffix=-backend
+                  tags: |
+                      type=schedule
+                      type=ref,event=branch
+                      type=ref,event=tag
+                      type=ref,event=pr
+                      type=sha,format=long
 
             - name: Build and push Docker image (frontend)
               uses: docker/build-push-action@91df6b874e498451163feb47610c87c4a218c1ee
               with:
                   context: frontend
+                  platforms: linux/amd64,linux/arm64
                   push: true
                   build-args: |
                       DOCKER_METADATA_OUTPUT_JSON
@@ -59,6 +78,7 @@ jobs:
               uses: docker/build-push-action@91df6b874e498451163feb47610c87c4a218c1ee
               with:
                   context: backend
+                  platforms: linux/amd64,linux/arm64
                   push: true
                   build-args: |
                       DOCKER_METADATA_OUTPUT_JSON