diff --git a/.circleci/build-wheel.sh b/.circleci/build-wheel.sh
deleted file mode 100755
index 88dbd559..00000000
--- a/.circleci/build-wheel.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash -ex
-
-cd /test
-
-echo "Building for ${PLATFORM}"
-
-PYBIN="/opt/python/${PYTHON}/bin"
-
-mkdir -p /test/wheelhouse.final
-
-"${PYBIN}"/python -m venv .venv
-
-.venv/bin/pip install -U pip wheel cffi
-
-.venv/bin/python setup.py sdist
-cd dist
-tar zxf PyNaCl*.tar.gz
-rm -rf PyNaCl*.tar.gz
-cd PyNaCl*
-
-REGEX="cp3([0-9])*"
-if [[ "${PYBIN}" =~ $REGEX ]]; then
-    PY_LIMITED_API="--py-limited-api=cp3${BASH_REMATCH[1]}"
-fi
-
-LIBSODIUM_MAKE_ARGS="-j$(nproc)" ../../.venv/bin/python setup.py bdist_wheel "$PY_LIMITED_API"
-
-auditwheel repair --plat "${PLATFORM}" -w wheelhouse/ dist/PyNaCl*.whl
-
-../../.venv/bin/pip install pynacl --no-index -f wheelhouse/
-../../.venv/bin/python -c "import nacl.signing; key = nacl.signing.SigningKey.generate();signature = key.sign(b'test'); key.verify_key.verify(signature)"
-
-mv wheelhouse/* /test/wheelhouse.final
diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index 3cb3c162..00000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,97 +0,0 @@
-version: 2.1
-
-commands:
-  docker-pull:
-    parameters:
-      image:
-        type: string
-    steps:
-      - run: docker pull <<parameters.image>>
-  docker-run:
-    parameters:
-      image:
-        type: string
-      command:
-        type: string
-    steps:
-      - run: docker run -e PLATFORM -e PYTHON -v $(pwd):/test <<parameters.image>>  /bin/bash -c 'cd /test;<<parameters.command>>'
-
-jobs:
-  linux-arm64:
-    machine:
-      image: ubuntu-2004:current
-    resource_class: arm.medium
-    parameters:
-      image:
-        type: string
-      toxenv:
-        type: string
-    steps:
-      - checkout
-      - docker-pull:
-          image: <<parameters.image>>
-      - docker-run:
-          image: <<parameters.image>>
-          command: /venv/bin/pip install tox && /venv/bin/tox -e <<parameters.toxenv>>
-  linux-arm64-wheel:
-    machine:
-      image: ubuntu-2004:current
-    resource_class: arm.medium
-    parameters:
-      image:
-        type: string
-      platform:
-        type: string
-      python:
-        type: string
-    environment:
-        PLATFORM: <<parameters.platform>>
-        PYTHON: <<parameters.python>>
-    steps:
-      - checkout
-      - docker-pull:
-          image: <<parameters.image>>
-      - docker-run:
-          image: <<parameters.image>>
-          command: /test/.circleci/build-wheel.sh
-      - store_artifacts:
-          path: wheelhouse.final
-
-workflows:
-  ci:
-    jobs:
-      - linux-arm64:
-          # Changing this name should only be done in conjunction with updating
-          # the required checks on GH
-          name: linux-arm64-ci
-          image: ghcr.io/pyca/cryptography-runner-ubuntu-jammy:aarch64
-          toxenv: py310
-          # This makes sure it runs on all tags in addition to PRs/branches.
-          # By default CircleCI ignores tags.
-          filters:
-            tags:
-              only: /.*/
-      - linux-arm64-wheel:
-          name: manylinux2014_aarch64-wheel
-          image: ghcr.io/pyca/cryptography-manylinux2014_aarch64:latest
-          python: cp37-cp37m
-          platform: manylinux2014_aarch64
-          filters:
-            tags:
-              only: /.*/
-      - linux-arm64-wheel:
-          name: manylinux_2_28_aarch64-wheel
-          image: ghcr.io/pyca/cryptography-manylinux_2_28:aarch64
-          python: cp37-cp37m
-          platform: manylinux_2_28_aarch64
-          filters:
-            tags:
-              only: /.*/
-      - linux-arm64-wheel:
-          name: musllinux_1_1_aarch64-wheel
-          image: ghcr.io/pyca/cryptography-musllinux_1_1:aarch64
-          python: cp37-cp37m
-          platform: musllinux_1_1_aarch64
-          filters:
-            tags:
-              only: /.*/
diff --git a/.github/workflows/wheel-builder.yml b/.github/workflows/wheel-builder.yml
index 99067cbf..39a82ba7 100644
--- a/.github/workflows/wheel-builder.yml
+++ b/.github/workflows/wheel-builder.yml
@@ -19,7 +19,7 @@ on:
 
 jobs:
   manylinux:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.MANYLINUX.RUNNER }}
     container:
       image: ghcr.io/pyca/${{ matrix.MANYLINUX.CONTAINER }}
       volumes:
@@ -30,9 +30,13 @@ jobs:
         PYTHON:
           - { VERSION: "cp3-cp37m", PATH: "/opt/python/cp37-cp37m/bin/python", ABI_VERSION: 'cp37' }
         MANYLINUX:
-          - { NAME: "manylinux2014_x86_64", CONTAINER: "cryptography-manylinux2014:x86_64" }
-          - { name: "manylinux_2_28_x86_64", CONTAINER: "cryptography-manylinux_2_28:x86_64"}
-          - { name: "musllinux_1_1_x86_64", CONTAINER: "cryptography-musllinux_1_1:x86_64"}
+          - { NAME: "manylinux2014_x86_64", CONTAINER: "cryptography-manylinux2014:x86_64", RUNNER: "ubuntu-latest" }
+          - { name: "manylinux_2_28_x86_64", CONTAINER: "cryptography-manylinux_2_28:x86_64", RUNNER: "ubuntu-latest" }
+          - { name: "musllinux_1_1_x86_64", CONTAINER: "cryptography-musllinux_1_1:x86_64", RUNNER: "ubuntu-latest" }
+
+          - { NAME: "manylinux2014_aarch64", CONTAINER: "cryptography-manylinux2014:aarch64", RUNNER: [self-hosted, Linux, ARM64] }
+          - { name: "manylinux_2_28_aarch64", CONTAINER: "cryptography-manylinux_2_28:aarch64", RUNNER: [self-hosted, Linux, ARM64] }
+          - { name: "musllinux_1_1_aarch64", CONTAINER: "cryptography-musllinux_1_1:aarch64", RUNNER: [self-hosted, Linux, ARM64] }
 
     name: "${{ matrix.PYTHON.VERSION }} for ${{ matrix.MANYLINUX.NAME }}"
     steps:
@@ -60,7 +64,7 @@ jobs:
       - run: mv wheelhouse/pynacl*.whl pynacl-wheelhouse/
       - uses: actions/upload-artifact@v4
         with:
-          name: "pynacl-${{ github.event.inputs.version }}-${{ matrix.MANYLINUX.NAME }}-  ${{ matrix.PYTHON.VERSION }}"
+          name: "pynacl-${{ github.event.inputs.version }}-${{ matrix.MANYLINUX.NAME }}-${{ matrix.PYTHON.VERSION }}"
 
           path: pynacl-wheelhouse/
   macos:
diff --git a/MANIFEST.in b/MANIFEST.in
index 9fdd5239..b3ebc7ce 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -39,7 +39,6 @@ recursive-include src/bindings *.py *.h
 
 # Remove our CI files
 recursive-exclude .github *
-recursive-exclude .circleci *
 
 # Remove readthedocs config
 exclude .readthedocs.yml