diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ca65e87..32dfd5c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -34,8 +34,10 @@ jobs:
     needs:
       - supported-platform-matrix
       - lint-dockerfile
-    runs-on: ubuntu-22.04-arm
+    runs-on: ${{ contains(matrix.platform, 'arm') && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
     steps:
+      - name: Runner Arch
+        run: echo "${{ runner.arch }}"
       - name: Prepare
         run: |
           platform=${{ matrix.platform }}
@@ -47,6 +49,7 @@ jobs:
           images: ${{ env.REGISTRY_IMAGE }}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
+        if: ${{ !contains(matrix.platform, 'arm') && !contains(matrix.platform, 'amd64') }}
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - uses: actions/checkout@v4
@@ -66,8 +69,10 @@ jobs:
     needs:
       - supported-platform-matrix
       - build-docker-image
-    runs-on: ubuntu-latest
+    runs-on: ${{ contains(matrix.platform, 'arm') && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
     steps:
+      - name: Runner Arch
+        run: echo "${{ runner.arch }}"
       - name: Prepare
         run: |
           platform=${{ matrix.platform }}
@@ -89,14 +94,17 @@ jobs:
       fail-fast: false
       matrix:
         platform: ${{ fromJson(needs.supported-platform-matrix.outputs.platform) }}
-    runs-on: ubuntu-latest
+    runs-on: ${{ contains(matrix.platform, 'arm') && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
     steps:
+      - name: Runner Arch
+        run: echo "${{ runner.arch }}"
       - name: Prepare
         run: |
           platform=${{ matrix.platform }}
           echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
+        if: ${{ !contains(matrix.platform, 'arm') && !contains(matrix.platform, 'amd64') }}
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
         with: