diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3680136d89ff7..2bc965c0d5033 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,16 +49,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: mingw-check
-            os: ubuntu-20.04-4core-16gb
-            env: {}
-          - name: mingw-check-tidy
-            os: ubuntu-20.04-4core-16gb
-            env: {}
-          - name: x86_64-gnu-llvm-15
-            os: ubuntu-20.04-16core-64gb
-            env: {}
-          - name: x86_64-gnu-tools
+          - name: dist-x86_64-linux
             os: ubuntu-20.04-16core-64gb
             env: {}
     timeout-minutes: 600
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 89b82d59d3176..ecc09675c5b0d 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -315,16 +315,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: mingw-check
-            <<: *job-linux-4c
-
-          - name: mingw-check-tidy
-            <<: *job-linux-4c
-
-          - name: x86_64-gnu-llvm-15
-            <<: *job-linux-16c
-
-          - name: x86_64-gnu-tools
+          - &dist-x86_64-linux
+            name: dist-x86_64-linux
             <<: *job-linux-16c
 
   auto: