diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 9a4d067..b08d3ad 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -1,4 +1,4 @@
-name: Docker Build and Push
+name: ci
 
 on:
   push:
@@ -6,69 +6,106 @@ on:
       - main
       - staging
 
+env:
+  REGISTRY_IMAGE: git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnl_please
+
 jobs:
-  build-and-push:
-    runs-on:
-      - linux
-      - ${{ matrix.arch }}
-    container:
-      image: docker.gitea.com/runner-images:ubuntu-latest
+  build:
     strategy:
+      fail-fast: false
       matrix:
-        arch: [amd64, arm64]
-
+        include:
+          - platform: linux/amd64
+            runner: ubuntu-latest
+          - platform: linux/arm64
+            runner: ubuntu-22.04-arm
+    runs-on: ${{ matrix.runner }}
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+      - name: Prepare
+        run: |
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY_IMAGE }}
 
-      - name: Log in to Docker registry
+      - name: Login to Docker registry
         uses: docker/login-action@v3
         with:
           registry: git.fossy.my.id
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Build and Push per-arch
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push by digest
+        id: build
         uses: docker/build-push-action@v6
         with:
           context: .
-          push: true
-          tags: git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnl_please:${{ matrix.arch }}
-          platforms: linux/${{ matrix.arch }}
+          platforms: ${{ matrix.platform }}
+          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ env.REGISTRY_IMAGE }}
+          outputs: type=image,push-by-digest=true,name-canonical=true,push=true
 
-  multi-arch-manifest:
+      - name: Export digest
+        run: |
+          mkdir -p ${{ runner.temp }}/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "${{ runner.temp }}/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v4
+        with:
+          name: digests-${{ env.PLATFORM_PAIR }}
+          path: ${{ runner.temp }}/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
     runs-on: ubuntu-latest
-    needs: build-and-push
+    needs:
+      - build
     steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+      - name: Download digests
+        uses: actions/download-artifact@v4
+        with:
+          path: ${{ runner.temp }}/digests
+          pattern: digests-*
+          merge-multiple: true
 
-      - name: Log in to Docker registry
+      - name: Login to Docker registry
         uses: docker/login-action@v3
         with:
           registry: git.fossy.my.id
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Push Multi-arch Manifest for main
-        if: github.ref == 'refs/heads/main'
-        uses: docker/build-push-action@v6
-        with:
-          push: true
-          tags: git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnl_please:latest
-          manifests: |
-            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnl_please:amd64
-            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnl_please:arm64
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-      - name: Push Multi-arch Manifest for staging
-        if: github.ref == 'refs/heads/staging'
-        uses: docker/build-push-action@v6
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
         with:
-          push: true
-          tags: git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnl_please:staging
-          manifests: |
-            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnl_please:amd64
-            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnl_please:arm64
+          images: ${{ env.REGISTRY_IMAGE }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+
+      - name: Create manifest list and push
+        working-directory: ${{ runner.temp }}/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}