diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml
index 7aff28d..861519a 100644
--- a/.github/workflows/build-images.yaml
+++ b/.github/workflows/build-images.yaml
@@ -7,6 +7,10 @@ on:
   pull_request:
     branches: [master]
 
+env:
+  IMAGES: docker.io/hapiproject/hapi
+  PLATFORMS: linux/amd64,linux/arm64/v8
+
 jobs:
   build:
     name: Build
@@ -14,32 +18,37 @@ jobs:
     steps:
       - name: Docker meta
         id: docker_meta
-        uses: crazy-max/ghaction-docker-meta@v1
+        uses: docker/metadata-action@v3
         with:
-          images: |
-            docker.io/hapiproject/hapi
-          tag-sha: false
-          tag-match: "v(.*)"
-      # waiting for https://github.com/crazy-max/ghaction-docker-meta/issues/13 for a cleaner solution
+          images: ${{ env.IMAGES }}
+          tags: |
+            type=match,pattern=image-(.*),group=1,enable=${{github.event_name != 'pull_request'}}
+            type=sha
+
       - name: Docker distroless meta
         id: docker_distroless_meta
-        uses: crazy-max/ghaction-docker-meta@v1
+        uses: docker/metadata-action@v3
         with:
-          images: |
-            docker.io/hapiproject/hapi
-          tag-sha: false
-          tag-match: "v(.*)"
-          sep-tags: -distroless,
+          images: ${{ env.IMAGES }}
+          tags: |
+            type=match,pattern=image-(.*),group=1,enable=${{github.event_name != 'pull_request'}}
+            type=sha
+          flavor: |
+            suffix=-distroless,onlatest=true
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
+
       - name: Login to DockerHub
         uses: docker/login-action@v1
         if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Cache Docker layers
         uses: actions/cache@v2
         with:
@@ -47,6 +56,7 @@ jobs:
           key: ${{ runner.os }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-
+
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v2
@@ -56,6 +66,8 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
+          platforms: ${{ env.PLATFORMS }}
+
       - name: Build and push distroless
         id: docker_build_distroless
         uses: docker/build-push-action@v2
@@ -63,10 +75,7 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
           push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.docker_distroless_meta.outputs.tags }}-distroless
+          tags: ${{ steps.docker_distroless_meta.outputs.tags }}
           labels: ${{ steps.docker_distroless_meta.outputs.labels }}
+          platforms: ${{ env.PLATFORMS }}
           target: release-distroless
-      - name: Print image digests
-        run: |
-          echo ${{ steps.docker_build.outputs.digest }}
-          echo ${{ steps.docker_build_distroless.outputs.digest }}