diff --git a/.github/workflows/libclang-abi-tests.yml b/.github/workflows/libclang-abi-tests.yml
--- a/.github/workflows/libclang-abi-tests.yml
+++ b/.github/workflows/libclang-abi-tests.yml
@@ -82,7 +82,7 @@
   abi-dump:
     if: github.repository_owner == 'llvm'
     needs: abi-dump-setup
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04-llvm
     strategy:
       matrix:
         name:
diff --git a/.github/workflows/llvm-project-tests.yml b/.github/workflows/llvm-project-tests.yml
--- a/.github/workflows/llvm-project-tests.yml
+++ b/.github/workflows/llvm-project-tests.yml
@@ -33,10 +33,8 @@
       fail-fast: false
       matrix:
         os:
-          - ubuntu-latest
-          # Use windows-2019 due to:
-          # https://developercommunity.visualstudio.com/t/Prev-Issue---with-__assume-isnan-/1597317
-          - windows-2019
+          - ubuntu-20.04-llvm
+          - windows-2022-llvm
           # We're using a specific version of macOS due to:
           # https://github.com/actions/virtual-environments/issues/5900
           # We need addtional testing to see if our workaround works for
diff --git a/.github/workflows/llvm-tests.yml b/.github/workflows/llvm-tests.yml
--- a/.github/workflows/llvm-tests.yml
+++ b/.github/workflows/llvm-tests.yml
@@ -29,29 +29,11 @@
 jobs:
   check_all:
     if: github.repository_owner == 'llvm'
-    name: Test llvm,clang,libclc
+    name: Test llvm,clang,lld,lldb,libclc
     uses: ./.github/workflows/llvm-project-tests.yml
     with:
       build_target: check-all
-      projects: clang;libclc
-
-  # These need to be separate from the check_all job, becuase there is not enough disk
-  # space to build all these projects on Windows.
-  build_lldb:
-    if: github.repository_owner == 'llvm'
-    name: Build lldb
-    uses: ./.github/workflows/llvm-project-tests.yml
-    with:
-      build_target: ''
-      projects: clang;lldb
-
-  check_lld:
-    if: github.repository_owner == 'llvm'
-    name: Test lld
-    uses: ./.github/workflows/llvm-project-tests.yml
-    with:
-      build_target: check-lld
-      projects: lld
+      projects: clang;lld;lldb;libclc
 
   abi-dump-setup:
     if: github.repository_owner == 'llvm'
@@ -87,7 +69,7 @@
   abi-dump:
     if: github.repository_owner == 'llvm'
     needs: abi-dump-setup
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04-llvm
     strategy:
       matrix:
         name: