diff --git a/.github/workflows/build_and_upload.yml b/.github/workflows/build_and_upload.yml
index 2696de5..42df75f 100644
--- a/.github/workflows/build_and_upload.yml
+++ b/.github/workflows/build_and_upload.yml
@@ -14,28 +14,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest, windows-latest, windows-11-arm]
     steps:
       - uses: "actions/checkout@v4"
         with:
           submodules: true
-      - name: "Set up QEMU"
-        if: matrix.os == 'ubuntu-latest'
-        uses: "docker/setup-qemu-action@v3"
-        with:
-          platforms: arm64
       - name: "Build wheels"
         uses: "pypa/cibuildwheel@v3.3.0"
         env:
-          CIBW_SKIP: "pp* cp36-* cp37-* cp38-* cp39-*"  # FIXME
-          CIBW_ARCHS_LINUX: "auto aarch64"
+          CIBW_SKIP: "pp* cp38-* cp39-* cp310-win_arm64"
           CIBW_TEST_REQUIRES: "pytest"
           CIBW_TEST_COMMAND: "pytest {project}/tests --doctest-modules"
       - uses: "actions/upload-artifact@v4"
         with:
           path: "./wheelhouse/*.whl"
           name: wheel-${{ matrix.os }}
- 
+
   make_sdist:
     name: "Build source distribution"
     runs-on: ubuntu-latest
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3b38e6d..a3304d0 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,14 +14,18 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest, windows-latest, windows-11-arm]
+        exclude:
+          # CPython has no official win_arm64 release before 3.11.
+          - os: windows-11-arm
+            python-version: "3.10"
       fail-fast: false
 
     steps:
       - uses: "actions/checkout@v4"
         with:
           submodules: true
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v7"
         with:
           python-version: "${{ matrix.python-version }}"
       - name: "Install dependencies"