diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index fc55128..fb93745 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -12,12 +12,12 @@ jobs:
           git config --global advice.detachedHead false
           git clone --branch 2025.05.2 --depth 1 https://codeberg.org/stagex/stagex.git $GITHUB_WORKSPACE
 
-      - name: Setup SSH
+      - name: Setup SSH for Buildx amd64
         uses: MrSquaare/ssh-setup-action@v3
         with:
           host: 10.0.0.101
           private-key: ${{ secrets.RUNNER_SSH_PRIVATE_KEY }}
-      - name: Setup SSH
+      - name: Setup SSH for Buildx arm64
         uses: MrSquaare/ssh-setup-action@v3
         with:
           host: 10.0.0.102
@@ -48,12 +48,12 @@ jobs:
         with:
           path: fetch/bootstrap/stage3
           key: stage3-${{ hashFiles('packages/bootstrap/stage3/package.toml') }}
-      # - name: Build stage3
-      #   env:
-      #     CONTAINER_REGISTRY: ${{ vars.CONTAINER_REGISTRY }}
-      #   run: |
-      #     sed -i 's|stagex/bootstrap-stage2|docker.io/stagex/bootstrap-stage2|' packages/bootstrap/stage3/Containerfile
-      #     make registry-bootstrap-stage3 PROGRESS=plain BUILDER="docker buildx" PLATFORM=linux/amd64,linux/arm64 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex
+      - name: Build stage3
+        env:
+          CONTAINER_REGISTRY: ${{ vars.CONTAINER_REGISTRY }}
+        run: |
+          sed -i 's|stagex/bootstrap-stage2|docker.io/stagex/bootstrap-stage2|' packages/bootstrap/stage3/Containerfile
+          make registry-bootstrap-stage3 PROGRESS=plain BUILDER="docker buildx" PLATFORM=linux/amd64,linux/arm64 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex
 
       - name: Restore filesystem cache
         uses: actions/cache@v4
@@ -64,7 +64,7 @@ jobs:
         env:
           CONTAINER_REGISTRY: ${{ vars.CONTAINER_REGISTRY }}
         run: |
-          make registry-core-filesystem PLATFORM=linux/amd64 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex
+          make registry-core-filesystem PLATFORM=linux/amd64,linux/arm64 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex
 
       - name: Restore binutils cache
         uses: actions/cache@v4
@@ -75,7 +75,7 @@ jobs:
         env:
           CONTAINER_REGISTRY: ${{ vars.CONTAINER_REGISTRY }}
         run: |
-          make registry-core-binutils PLATFORM=linux/amd64 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex
+          make registry-core-binutils PLATFORM=linux/amd64,linux/arm64 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex
 
       - name: Restore busybox cache
         uses: actions/cache@v4
@@ -86,7 +86,7 @@ jobs:
         env:
           CONTAINER_REGISTRY: ${{ vars.CONTAINER_REGISTRY }}
         run: |
-          make registry-core-busybox PLATFORM=linux/amd64 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex
+          make registry-core-busybox PLATFORM=linux/amd64,linux/arm64 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex
 
       - name: Restore gcc cache
         uses: actions/cache@v4
@@ -97,23 +97,18 @@ jobs:
         env:
           CONTAINER_REGISTRY: ${{ vars.CONTAINER_REGISTRY }}
         run: |
-          make registry-core-gcc PLATFORM=linux/amd64 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex
+          make registry-core-gcc PLATFORM=linux/amd64,linux/arm64 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex
 
       - name: Restore make cache
         uses: actions/cache@v4
         with:
           path: fetch/core/make
           key: make-${{ hashFiles('packages/core/make/package.toml') }}
-      - name: Restore buildx cache
-        uses: actions/cache@v4
-        with:
-          path: /tmp/.buildx-cache
-          key: buildx-${{ hashFiles('packages/core/make/package.toml') }}
       - name: Build make
         env:
           CONTAINER_REGISTRY: ${{ vars.CONTAINER_REGISTRY }}
         run: |
-          make registry-core-make PROGRESS=plain BUILDER="docker buildx" PLATFORM=linux/amd64 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex
+          make registry-core-make PROGRESS=plain BUILDER="docker buildx" PLATFORM=linux/amd64,linux/arm64 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex
 
       - name: Restore musl cache
         uses: actions/cache@v4
@@ -124,7 +119,7 @@ jobs:
         env:
           CONTAINER_REGISTRY: ${{ vars.CONTAINER_REGISTRY }}
         run: |
-          make registry-core-musl PLATFORM=linux/amd64 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex
+          make registry-core-musl PLATFORM=linux/amd64,linux/arm64 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex
 
       - name: Restore diffutils cache
         uses: actions/cache@v4
@@ -135,7 +130,7 @@ jobs:
         env:
           CONTAINER_REGISTRY: ${{ vars.CONTAINER_REGISTRY }}
         run: |
-          make registry-core-diffutils PLATFORM=linux/amd64 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex
+          make registry-core-diffutils PLATFORM=linux/amd64,linux/arm64 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex
 
       - name: Restore go cache
         uses: actions/cache@v4
@@ -146,4 +141,4 @@ jobs:
         env:
           CONTAINER_REGISTRY: ${{ vars.CONTAINER_REGISTRY }}
         run: |
-          make registry-core-go PLATFORM=linux/amd64 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex
+          make registry-core-go PLATFORM=linux/amd64,linux/arm64 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex