diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dd1157e90f..13ae6753d1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,9 +26,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, arm64-8core-32gb, macos-13, windows-2019]
-        exclude:
-          - os: ${{ github.repository != 'containerd/containerd' && 'arm64-8core-32gb' }}
+        os: [ubuntu-20.04, ubuntu-24.04-arm, macos-13, windows-2019]
 
     steps:
       - uses: actions/checkout@v4
@@ -193,10 +191,8 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, arm64-8core-32gb, macos-13, windows-2019, windows-2022]
+        os: [ubuntu-20.04, ubuntu-24.04-arm, macos-13, windows-2019, windows-2022]
         go-version: ["1.23.6", "1.24.0"]
-        exclude:
-          - os: ${{ github.repository != 'containerd/containerd' && 'arm64-8core-32gb' }}
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/install-go
@@ -396,17 +392,16 @@ jobs:
           - io.containerd.runc.v2
         runc: [runc, crun]
         enable_cri_sandboxes: ["", "sandboxed"]
-        os: [ubuntu-20.04, arm64-8core-32gb]
+        os: [ubuntu-20.04, ubuntu-24.04-arm]
         exclude:
-          - os: ${{ github.repository != 'containerd/containerd' && 'arm64-8core-32gb' }}
           - runtime: io.containerd.runc.v1
             runc: crun
           - runtime: io.containerd.runtime.v1.linux
             runc: crun
           - runtime: io.containerd.runc.v1
-            os: arm64-8core-32gb
+            os: ubuntu-24.04-arm
           - runtime: io.containerd.runtime.v1.linux
-            os: arm64-8core-32gb
+            os: ubuntu-24.04-arm
 
     env:
       GOTEST: gotestsum --
@@ -427,10 +422,6 @@ jobs:
           script/setup/install-failpoint-binaries
 
       - name: Install criu
-        # NOTE: Required arm64 enable CONFIG_CHECKPOINT_RESTORE (need to confirm GitHub action runners config)
-        #
-        # REF: https://criu.org/Linux_kernel
-        if: matrix.os != 'arm64-8core-32gb'
         run: |
           sudo add-apt-repository -y ppa:criu/ppa
           sudo apt-get update