diff --git a/.github/workflows/gh-build-and-test.yml b/.github/workflows/gh-build-and-test.yml
index 3766a07ee..61838e94c 100644
--- a/.github/workflows/gh-build-and-test.yml
+++ b/.github/workflows/gh-build-and-test.yml
@@ -17,7 +17,7 @@ jobs:
     with:
       device: ${{ inputs.device }}
       image: ${{ inputs.image }}
-      runs-on: ${{ github.repository_owner == 'nv-legate' && 'linux-amd64-32cpu' || 'ubuntu-latest' }}
+      runs-on: ${{ github.repository_owner == 'nv-legate' && 'linux-amd64-cpu32' || 'ubuntu-latest' }}
 
   test:
     needs:
@@ -52,13 +52,13 @@ jobs:
 
           - name: OpenMP test
             options: test --use openmp --omps 1 --ompthreads 2 --debug
-            runner: ${{ inputs.device == 'gpu' && 'linux-amd64-gpu-v100-latest-1' || 'linux-amd64-32cpu' }}
+            runner: ${{ inputs.device == 'gpu' && 'linux-amd64-gpu-v100-latest-1' || 'linux-amd64-cpu32' }}
             has-gpu: ${{ inputs.device == 'gpu' }}
             enabled: true
 
           - name: 2 NUMA OpenMPs test
             options: test --use openmp --omps 2 --ompthreads 2 --numamem 2048 --debug
-            runner: ${{ inputs.device == 'gpu' && 'linux-amd64-gpu-v100-latest-1' || 'linux-amd64-32cpu' }}
+            runner: ${{ inputs.device == 'gpu' && 'linux-amd64-gpu-v100-latest-1' || 'linux-amd64-cpu32' }}
             has-gpu: ${{ inputs.device == 'gpu' }}
             enabled: true
 
@@ -76,7 +76,7 @@ jobs:
 
           - name: documentation
             options: docs
-            runner: linux-amd64-32cpu
+            runner: linux-amd64-cpu4
             has-gpu: false
             enabled: ${{ inputs.device == 'gpu' }}