diff --git a/kernel-testing.yaml b/kernel-testing.yaml
index 3807059..89b7cab 100644
--- a/kernel-testing.yaml
+++ b/kernel-testing.yaml
@@ -34,10 +34,6 @@ data:
       - lld-libs
   components:
     rpms:
-      python-lit:
-        rationale: Lit test runner for LLVM
-        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
-        buildorder: 0
       llvm-compat:
         rationale: LLVM compatibility libraries
         multilib: [x86_64]
@@ -48,32 +44,7 @@ data:
         multilib: [x86_64]
         ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
         buildorder: 0
-      clang:
-        rationale: clang tools and libraries 
-        multilib: [x86_64]
-        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
-        buildorder: 1
-      lld:
-        rationale: LLVM linker
-        multilib: [x86_64]
-        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
-        buildorder: 2
-      compiler-rt:
-        rationale: LLVM compiler intrinsic and sanitizer libraries
-        multilib: [x86_64]
-        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
-        buildorder: 2
-      libomp:
-        rationale: LLVM OpenMP runtime
-        multilib: [x86_64]
-        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
-        buildorder: 2
-      lldb:
-        rationale: lldb debugger
-        multilib: [x86_64]
-        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
-        buildorder: 2
       kernel:
         ref: rhel-8-main
-        buildorder: 3
+        buildorder: 1
         buildonly: true
diff --git a/llvm-toolset.yaml b/llvm-toolset.yaml
index 4c6c420..3167d90 100644
--- a/llvm-toolset.yaml
+++ b/llvm-toolset.yaml
@@ -34,10 +34,6 @@ data:
       - lld-libs
   components:
     rpms:
-      python-lit:
-        rationale: Lit test runner for LLVM
-        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
-        buildorder: 0
       llvm-compat:
         rationale: LLVM compatibility libraries
         multilib: [x86_64]
@@ -48,28 +44,3 @@ data:
         multilib: [x86_64]
         ref: stream-llvm-toolset-rhel8-rhel-8.10.0
         buildorder: 0
-      clang:
-        rationale: clang tools and libraries 
-        multilib: [x86_64]
-        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
-        buildorder: 1
-      lld:
-        rationale: LLVM linker
-        multilib: [x86_64]
-        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
-        buildorder: 2
-      compiler-rt:
-        rationale: LLVM compiler intrinsic and sanitizer libraries
-        multilib: [x86_64]
-        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
-        buildorder: 2
-      libomp:
-        rationale: LLVM OpenMP runtime
-        multilib: [x86_64]
-        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
-        buildorder: 2
-      lldb:
-        rationale: lldb debugger
-        multilib: [x86_64]
-        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
-        buildorder: 2