diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8971f18afc828..3e00fb0ac5180 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,10 +37,6 @@ jobs:
     if: "github.event_name == 'pull_request'"
     strategy:
       matrix:
-        name:
-          - mingw-check
-          - x86_64-gnu-llvm-8
-          - x86_64-gnu-tools
         include:
           - name: mingw-check
             os: ubuntu-latest-xl
@@ -153,9 +149,6 @@ jobs:
     if: "github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'"
     strategy:
       matrix:
-        name:
-          - dist-x86_64-linux
-          - dist-x86_64-linux-alt
         include:
           - name: dist-x86_64-linux
             os: ubuntu-latest-xl
@@ -265,64 +258,6 @@ jobs:
     if: "github.event_name == 'push' && github.ref == 'refs/heads/auto' && github.repository == 'rust-lang-ci/rust'"
     strategy:
       matrix:
-        name:
-          - arm-android
-          - armhf-gnu
-          - dist-aarch64-linux
-          - dist-android
-          - dist-arm-linux
-          - dist-armhf-linux
-          - dist-armv7-linux
-          - dist-i586-gnu-i586-i686-musl
-          - dist-i686-freebsd
-          - dist-i686-linux
-          - dist-i686-mingw
-          - dist-i686-msvc
-          - dist-mips-linux
-          - dist-mips64-linux
-          - dist-mips64el-linux
-          - dist-mipsel-linux
-          - dist-powerpc-linux
-          - dist-powerpc64-linux
-          - dist-powerpc64le-linux
-          - dist-s390x-linux
-          - dist-various-1
-          - dist-various-2
-          - dist-x86_64-apple
-          - dist-x86_64-apple-alt
-          - dist-x86_64-freebsd
-          - dist-x86_64-linux
-          - dist-x86_64-linux-alt
-          - dist-x86_64-mingw
-          - dist-x86_64-msvc
-          - dist-x86_64-msvc-alt
-          - dist-x86_64-musl
-          - dist-x86_64-netbsd
-          - i686-gnu
-          - i686-gnu-nopt
-          - i686-mingw-1
-          - i686-mingw-2
-          - i686-msvc-1
-          - i686-msvc-2
-          - mingw-check
-          - test-various
-          - wasm32
-          - x86_64-apple
-          - x86_64-gnu
-          - x86_64-gnu-aux
-          - x86_64-gnu-debug
-          - x86_64-gnu-distcheck
-          - x86_64-gnu-full-bootstrap
-          - x86_64-gnu-llvm-8
-          - x86_64-gnu-nopt
-          - x86_64-gnu-tools
-          - x86_64-mingw-1
-          - x86_64-mingw-2
-          - x86_64-msvc-1
-          - x86_64-msvc-2
-          - x86_64-msvc-aux
-          - x86_64-msvc-cargo
-          - x86_64-msvc-tools
         include:
           - name: arm-android
             os: ubuntu-latest-xl
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 88ef6b42f106d..74581232af7cd 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -257,10 +257,6 @@ jobs:
     if: github.event_name == 'pull_request'
     strategy:
       matrix:
-        name:
-          - mingw-check
-          - x86_64-gnu-llvm-8
-          - x86_64-gnu-tools
         include:
           - name: mingw-check
             <<: *job-linux-xl
@@ -281,9 +277,6 @@ jobs:
     if: github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'
     strategy:
       matrix:
-        name:
-          - dist-x86_64-linux
-          - dist-x86_64-linux-alt
         include:
           - name: dist-x86_64-linux
             <<: *job-linux-xl
@@ -301,64 +294,6 @@ jobs:
     if: github.event_name == 'push' && github.ref == 'refs/heads/auto' && github.repository == 'rust-lang-ci/rust'
     strategy:
       matrix:
-        name:
-          - arm-android
-          - armhf-gnu
-          - dist-aarch64-linux
-          - dist-android
-          - dist-arm-linux
-          - dist-armhf-linux
-          - dist-armv7-linux
-          - dist-i586-gnu-i586-i686-musl
-          - dist-i686-freebsd
-          - dist-i686-linux
-          - dist-i686-mingw
-          - dist-i686-msvc
-          - dist-mips-linux
-          - dist-mips64-linux
-          - dist-mips64el-linux
-          - dist-mipsel-linux
-          - dist-powerpc-linux
-          - dist-powerpc64-linux
-          - dist-powerpc64le-linux
-          - dist-s390x-linux
-          - dist-various-1
-          - dist-various-2
-          - dist-x86_64-apple
-          - dist-x86_64-apple-alt
-          - dist-x86_64-freebsd
-          - dist-x86_64-linux
-          - dist-x86_64-linux-alt
-          - dist-x86_64-mingw
-          - dist-x86_64-msvc
-          - dist-x86_64-msvc-alt
-          - dist-x86_64-musl
-          - dist-x86_64-netbsd
-          - i686-gnu
-          - i686-gnu-nopt
-          - i686-mingw-1
-          - i686-mingw-2
-          - i686-msvc-1
-          - i686-msvc-2
-          - mingw-check
-          - test-various
-          - wasm32
-          - x86_64-apple
-          - x86_64-gnu
-          - x86_64-gnu-aux
-          - x86_64-gnu-debug
-          - x86_64-gnu-distcheck
-          - x86_64-gnu-full-bootstrap
-          - x86_64-gnu-llvm-8
-          - x86_64-gnu-nopt
-          - x86_64-gnu-tools
-          - x86_64-mingw-1
-          - x86_64-mingw-2
-          - x86_64-msvc-1
-          - x86_64-msvc-2
-          - x86_64-msvc-aux
-          - x86_64-msvc-cargo
-          - x86_64-msvc-tools
         include:
           #############################
           #   Linux/Docker builders   #