diff --git a/.github/actionlint.yml b/.github/actionlint.yml
index 56f5066466..d180519c06 100644
--- a/.github/actionlint.yml
+++ b/.github/actionlint.yml
@@ -6,9 +6,8 @@ self-hosted-runner:
     - small
     - small-arm64
     - us-east-2
-    - neon-arm64-16core
-    - neon-arm64-80core
-    - neon-arm64-32core
+    - aws-arm64-16core
+    - aws-arm64-32core
 config-variables:
   - BENCHMARK_PROJECT_ID_PUB
   - BENCHMARK_PROJECT_ID_SUB
diff --git a/.github/workflows/_build-and-test-locally.yml b/.github/workflows/_build-and-test-locally.yml
index 9fb6679426..78fe35f1ba 100644
--- a/.github/workflows/_build-and-test-locally.yml
+++ b/.github/workflows/_build-and-test-locally.yml
@@ -36,7 +36,7 @@ env:
 
 jobs:
   build-neon:
-    runs-on: ${{ fromJson(format('["self-hosted", "{0}"]', inputs.arch == 'arm64' && 'neon-arm64-80core' || 'large')) }}
+    runs-on: ${{ fromJson(format('["self-hosted", "{0}"]', inputs.arch == 'arm64' && 'aws-arm64-16core' || 'large')) }}
     container:
       image: ${{ inputs.build-tools-image }}
       credentials:
@@ -258,7 +258,7 @@ jobs:
     # Don't run regression tests on debug arm64 builds
     if: inputs.build-type != 'debug' || inputs.arch != 'arm64'
     needs: [ build-neon ]
-    runs-on: ${{ fromJson(format('["self-hosted", "{0}"]', inputs.arch == 'arm64' && 'neon-arm64-80core' || 'large')) }}
+    runs-on: ${{ fromJson(format('["self-hosted", "{0}"]', inputs.arch == 'arm64' && 'aws-arm64-16core' || 'large')) }}
     container:
       image: ${{ inputs.build-tools-image }}
       credentials: