diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 61c765c..9988887 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
   makefile-analysis:
     name: makefile-analysis
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -23,11 +23,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runner: ["ubuntu-20.04"]
+        runner: ["ubuntu-22.04"]
         compiler: ["gcc", "clang"]
         openmp: ["0", "1"]
         include:
-          - runner: "macos-12"
+          - runner: "macos-13"
             compiler: "clang"
             openmp: "0"
     env:
@@ -48,13 +48,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runner: ["ubuntu-20.04", "windows-2019"]
+        runner: ["ubuntu-22.04", "windows-2019"]
         platform: ["x86_64", "i686"]
         include:
-          - runner: "macos-12"
+          - runner: "macos-13"
             platform: "x86_64"
           - runner: "macos-14"
             platform: "arm64"
+          - runner: "ubuntu-22.04-arm"
+            platform: "aarch64"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -81,9 +83,17 @@ jobs:
           BASE64_TEST_SKIP_AVX512: "1"
 
   alpine-makefile-test:
-    name: makefile-alpine-amd64-gcc
+    name: makefile-alpine-${{ matrix.platform }}-gcc
     needs: makefile-analysis
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - runner: "ubuntu-24.04"
+            platform: "x86_64"
+          - runner: "ubuntu-24.04-arm"
+            platform: "aarch64"
     container:
       image: alpine:3.12
       env:
@@ -97,9 +107,17 @@ jobs:
         run: ./test/ci/test.sh
 
   alpine-cmake-test:
-    name: cmake-alpine-amd64-gcc
+    name: cmake-alpine-${{ matrix.platform }}-gcc
     needs: makefile-analysis
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - runner: "ubuntu-24.04"
+            platform: "x86_64"
+          - runner: "ubuntu-24.04-arm"
+            platform: "aarch64"
     container:
       image: alpine:3.12
     steps:
@@ -129,7 +147,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [armv7, aarch64, s390x, ppc64le]
+        arch: [armv7, s390x, ppc64le]
         cc: [gcc, clang]
     steps:
       - name: Checkout
@@ -150,7 +168,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [armv7, aarch64, s390x, ppc64le]
+        arch: [armv7, s390x, ppc64le]
         cc: [gcc, clang]
     steps:
       - name: Checkout