diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a0d9eb8c45292..bd2c693d31653 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,12 +56,8 @@ jobs:
           - name: mingw-check-tidy
             os: ubuntu-20.04-4core-16gb
             env: {}
-          - name: x86_64-gnu-llvm-16
-            env:
-              ENABLE_GCC_CODEGEN: "1"
-            os: ubuntu-20.04-16core-64gb
-          - name: x86_64-gnu-tools
-            os: ubuntu-20.04-16core-64gb
+          - name: x86_64-gnu
+            os: ubuntu-20.04-8core-32gb
             env: {}
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 5b9c90273a34c..331aabd71fc58 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -334,13 +334,16 @@ jobs:
           - name: mingw-check-tidy
             <<: *job-linux-4c
 
-          - name: x86_64-gnu-llvm-16
-            env:
-              ENABLE_GCC_CODEGEN: "1"
-            <<: *job-linux-16c
+          # - name: x86_64-gnu-llvm-16
+          #   env:
+          #     ENABLE_GCC_CODEGEN: "1"
+          #   <<: *job-linux-16c
+          #
+          # - name: x86_64-gnu-tools
+          #   <<: *job-linux-16c
 
-          - name: x86_64-gnu-tools
-            <<: *job-linux-16c
+          - name: x86_64-gnu
+            <<: *job-linux-8c
 
   auto:
     <<: *base-ci-job