diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
index 82e2fef5de2..f630d5ad811 100644
--- a/.github/workflows/ci-main.yml
+++ b/.github/workflows/ci-main.yml
@@ -29,14 +29,13 @@ env:
 jobs:
   bazel-test-all:
     name: Bazel Test All
+    runs-on:
+      labels: dind-test
     container:
       image: ghcr.io/dfinity/ic-build@sha256:4fd13b47285e783c3a6f35aadd9559d097c0de162a1cf221ead66ab1598d5d45
       options: >-
         -e NODE_NAME --privileged --cgroupns host  --network host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info
     timeout-minutes: 90
-    runs-on:
-      group: zh1
-      labels: dind-large
     env:
       AWS_SHARED_CREDENTIALS_CONTENT: ${{ secrets.AWS_SHARED_CREDENTIALS_FILE }}
       # Only run ci/bazel-scripts/diff.sh on PRs that are not labeled with "CI_ALL_BAZEL_TARGETS".
@@ -125,7 +124,7 @@ jobs:
             bazel-targets
   bazel-build-all-config-check:
     runs-on:
-      labels: dind-small
+      labels: dind-test
     container:
       image: ghcr.io/dfinity/ic-build@sha256:4fd13b47285e783c3a6f35aadd9559d097c0de162a1cf221ead66ab1598d5d45
       options: >-
@@ -219,7 +218,7 @@ jobs:
   bazel-build-fuzzers:
     name: Bazel Build Fuzzers
     runs-on:
-      labels: dind-small
+      labels: dind-test
     container:
       image: ghcr.io/dfinity/ic-build@sha256:4fd13b47285e783c3a6f35aadd9559d097c0de162a1cf221ead66ab1598d5d45
       options: >-
@@ -254,7 +253,7 @@ jobs:
   bazel-build-fuzzers-afl:
     name: Bazel Build Fuzzers AFL
     runs-on:
-      labels: dind-small
+      labels: dind-test
     container:
       image: ghcr.io/dfinity/ic-build@sha256:4fd13b47285e783c3a6f35aadd9559d097c0de162a1cf221ead66ab1598d5d45
       options: >-