diff --git a/.github/workflows/jobs-java.yml b/.github/workflows/jobs-java.yml
index 984b92734ec..e8d365b2304 100644
--- a/.github/workflows/jobs-java.yml
+++ b/.github/workflows/jobs-java.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 jobs:
   build-linux-java:
     runs-on:
-      group: large
+      group: 4-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
@@ -19,7 +19,7 @@ jobs:
     - uses: "./.github/actions/post-steps"
   build-linux-java-static:
     runs-on:
-      group: large
+      group: 4-core-ubuntu
     container:
       image: evolvedbinary/rocksjava:centos6_x64-be
     steps:
@@ -99,7 +99,7 @@ jobs:
     - uses: "./.github/actions/post-steps"
   build-linux-java-pmd:
     runs-on:
-      group: large
+      group: 4-core-ubuntu
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: "./.github/actions/install-maven"
diff --git a/.github/workflows/jobs-linux-no-test-run.yml b/.github/workflows/jobs-linux-no-test-run.yml
index be989a783a0..a6b70055606 100644
--- a/.github/workflows/jobs-linux-no-test-run.yml
+++ b/.github/workflows/jobs-linux-no-test-run.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 jobs:
   build-linux-release:
     runs-on:
-      group: 2xlarge
+      group: 16-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
@@ -27,7 +27,7 @@ jobs:
     - uses: "./.github/actions/post-steps"
   build-linux-release-rtti:
     runs-on:
-      group: xlarge
+      group: 8-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
@@ -40,7 +40,7 @@ jobs:
     - run: if ./db_stress --version; then false; else true; fi
   build-examples:
     runs-on:
-      group: large
+      group: 4-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
@@ -51,7 +51,7 @@ jobs:
     - uses: "./.github/actions/post-steps"
   build-fuzzers:
     runs-on:
-      group: large
+      group: 4-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
@@ -64,7 +64,7 @@ jobs:
     - uses: "./.github/actions/post-steps"
   build-linux-clang-no_test_run:
     runs-on:
-      group: xlarge
+      group: 8-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
@@ -73,7 +73,7 @@ jobs:
     - uses: "./.github/actions/post-steps"
   build-linux-clang-13-no_test_run:
     runs-on:
-      group: 2xlarge
+      group: 16-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
@@ -83,7 +83,7 @@ jobs:
     - uses: "./.github/actions/post-steps"
   build-linux-gcc-8-no_test_run:
     runs-on:
-      group: 2xlarge
+      group: 16-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
@@ -93,7 +93,7 @@ jobs:
     - uses: "./.github/actions/post-steps"
   build-linux-gcc-10-cxx20-no_test_run:
     runs-on:
-      group: 2xlarge
+      group: 16-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
@@ -103,7 +103,7 @@ jobs:
     - uses: "./.github/actions/post-steps"
   build-linux-gcc-11-no_test_run:
     runs-on:
-      group: 2xlarge
+      group: 16-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
diff --git a/.github/workflows/jobs-linux-other-checks.yml b/.github/workflows/jobs-linux-other-checks.yml
index 49dbddd5fff..eb1f3f0fd04 100644
--- a/.github/workflows/jobs-linux-other-checks.yml
+++ b/.github/workflows/jobs-linux-other-checks.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 jobs:
   build-linux-clang10-clang-analyze:
     runs-on:
-      group: 2xlarge
+      group: 16-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
@@ -19,7 +19,7 @@ jobs:
         path: scan_build_report.tar.gz
   build-linux-unity-and-headers:
     runs-on:
-      group: large
+      group: 4-core-ubuntu
     container:
       image: gcc:latest
     env:
@@ -33,7 +33,7 @@ jobs:
     - uses: "./.github/actions/post-steps"
   build-linux-mini-crashtest:
     runs-on:
-      group: large
+      group: 4-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
diff --git a/.github/workflows/jobs-linux-run-tests-san.yml b/.github/workflows/jobs-linux-run-tests-san.yml
index fe85232ae4c..b8ef69f52af 100644
--- a/.github/workflows/jobs-linux-run-tests-san.yml
+++ b/.github/workflows/jobs-linux-run-tests-san.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 jobs:
   build-linux-clang10-asan:
     runs-on: 
-      group: 2xlargeplus
+      group: 32-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
@@ -13,7 +13,7 @@ jobs:
     - uses: "./.github/actions/post-steps"
   build-linux-clang10-ubsan:
     runs-on: 
-      group: 2xlarge
+      group: 16-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
@@ -23,7 +23,7 @@ jobs:
     - uses: "./.github/actions/post-steps"
   build-linux-clang10-mini-tsan:
     runs-on: 
-      group: 2xlargeplus
+      group: 32-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
@@ -33,7 +33,7 @@ jobs:
     - uses: "./.github/actions/post-steps"
   build-linux-static_lib-alt_namespace-status_checked:
     runs-on:
-      group: 2xlarge
+      group: 16-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
diff --git a/.github/workflows/jobs-linux-run-tests.yml b/.github/workflows/jobs-linux-run-tests.yml
index 462a432fd4f..a4853bbddbb 100644
--- a/.github/workflows/jobs-linux-run-tests.yml
+++ b/.github/workflows/jobs-linux-run-tests.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 jobs:
   build-linux:
     runs-on: 
-      group: 2xlarge
+      group: 16-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
@@ -13,7 +13,7 @@ jobs:
     - uses: "./.github/actions/post-steps"
   build-linux-cmake-mingw:
     runs-on: 
-      group: large
+      group: 4-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
@@ -30,7 +30,7 @@ jobs:
     - uses: "./.github/actions/post-steps"
   build-linux-cmake-with-folly:
     runs-on: 
-      group: 2xlarge
+      group: 16-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
@@ -42,7 +42,7 @@ jobs:
     - uses: "./.github/actions/post-steps"
   build-linux-cmake-with-folly-lite-no-test:
     runs-on: 
-      group: 2xlarge
+      group: 16-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
@@ -53,7 +53,7 @@ jobs:
     - uses: "./.github/actions/post-steps"
   build-linux-gcc-7-with-folly:
     runs-on: 
-      group: 2xlarge
+      group: 16-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
@@ -65,7 +65,7 @@ jobs:
     - uses: "./.github/actions/post-steps"
   build-linux-gcc-7-with-folly-lite-no-test:
     runs-on: 
-      group: 2xlarge
+      group: 16-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
@@ -76,7 +76,7 @@ jobs:
     - uses: "./.github/actions/post-steps"
   build-linux-cmake-with-folly-coroutines:
     runs-on: 
-      group: 2xlarge
+      group: 16-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     env:
@@ -91,7 +91,7 @@ jobs:
     - uses: "./.github/actions/post-steps"
   build-linux-cmake-with-benchmark:
     runs-on: 
-      group: 2xlarge
+      group: 16-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps:
@@ -101,7 +101,7 @@ jobs:
     - uses: "./.github/actions/post-steps"
   build-linux-encrypted_env-no_compression:
     runs-on:
-      group: 2xlarge
+      group: 16-core-ubuntu
     container:
       image: zjay437/rocksdb:0.6
     steps: