diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml
index 5f51f0d47..0d46e9e88 100644
--- a/.github/workflows/push-image.yml
+++ b/.github/workflows/push-image.yml
@@ -8,11 +8,11 @@ on:
       runtime:
         description: 'Runtime image'
         required: true
-        default: 'hackmdio/runtime:16.20.2-58224661'
+        default: 'hackmdio/runtime:16.20.2-35fe7e39'
       buildpack:
         description: 'Buildpack image'
         required: true
-        default: 'hackmdio/buildpack:16.20.2-58224661'
+        default: 'hackmdio/buildpack:16.20.2-35fe7e39'
 
 env:
   REGISTRY_IMAGE: hackmdio/hackmd
@@ -25,7 +25,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          # - linux/arm64
+          - linux/arm64
     steps:
       -
         name: Prepare
@@ -41,9 +41,6 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY_IMAGE }}
-          tags:
-            type=match,pattern=\d.\d.\d
-            type=sha
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -64,11 +61,11 @@ jobs:
           context: .
           file: ./deployments/Dockerfile
           platforms: ${{ matrix.platform }}
-          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
           outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
           build-args: |
-            RUNTIME=${{ github.event.inputs.runtime || 'hackmdio/runtime:16.20.2-58224661' }}
-            BUILDPACK=${{ github.event.inputs.buildpack || 'hackmdio/buildpack:16.20.2-58224661' }}
+            RUNTIME=${{ github.event.inputs.runtime || 'hackmdio/runtime:16.20.2-35fe7e39' }}
+            BUILDPACK=${{ github.event.inputs.buildpack || 'hackmdio/buildpack:16.20.2-35fe7e39' }}
       -
         name: Export digest
         run: |
@@ -105,6 +102,9 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY_IMAGE }}
+          tags: |
+            type=match,pattern=\d.\d.\d
+            type=sha,prefix=
       -
         name: Login to Docker Hub
         uses: docker/login-action@v3