diff --git a/kernel-testing.yaml b/kernel-testing.yaml
index 796c14a..842e8a7 100644
--- a/kernel-testing.yaml
+++ b/kernel-testing.yaml
@@ -2,7 +2,7 @@ document: modulemd
 version: 2
 data:
   name: llvm-toolset
-  stream: rhel8
+  stream: rhel_next
   summary: LLVM
   description: LLVM Tools and libraries
   license:
@@ -10,8 +10,10 @@ data:
   dependencies:
     - buildrequires:
         platform: [el8]
+        swig: [4.0]
       requires:
         platform: [el8]
+        swig: [4.0]
   profiles:
     common:
       rpms:
@@ -35,37 +37,42 @@ data:
     rpms:
       python-lit:
         rationale: Lit test runner for LLVM
-        ref: stream-llvm-toolset-rhel8-rhel-8.10.0
+        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
+        buildorder: 0
+      llvm-compat:
+        rationale: LLVM compatibility libraries
+        multilib: [x86_64]
+        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
         buildorder: 0
       llvm:
         rationale: LLVM tools and libraries
         multilib: [x86_64]
-        ref: stream-llvm-toolset-rhel8-rhel-8.10.0
+        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
         buildorder: 0
-      lld:
-        rationale: LLVM linker
-        multilib: [x86_64]
-        ref: stream-llvm-toolset-rhel8-rhel-8.10.0
-        buildorder: 1
       clang:
         rationale: clang tools and libraries 
         multilib: [x86_64]
-        ref: stream-llvm-toolset-rhel8-rhel-8.10.0
+        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-rhel8-rhel-8.10.0
+        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
         buildorder: 2
       libomp:
         rationale: LLVM OpenMP runtime
         multilib: [x86_64]
-        ref: stream-llvm-toolset-rhel8-rhel-8.10.0
+        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
         buildorder: 2
       lldb:
         rationale: lldb debugger
         multilib: [x86_64]
-        ref: stream-llvm-toolset-rhel8-rhel-8.10.0
+        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
         buildorder: 2
       kernel:
         ref: c8s
diff --git a/llvm-toolset.yaml b/llvm-toolset.yaml
index aa8a11b..44b4646 100644
--- a/llvm-toolset.yaml
+++ b/llvm-toolset.yaml
@@ -2,7 +2,7 @@ document: modulemd
 version: 2
 data:
   name: llvm-toolset
-  stream: rhel8
+  stream: rhel_next
   summary: LLVM
   description: LLVM Tools and libraries
   license:
@@ -10,8 +10,10 @@ data:
   dependencies:
     - buildrequires:
         platform: [el8]
+        swig: [4.0]
       requires:
         platform: [el8]
+        swig: [4.0]
   profiles:
     common:
       rpms:
@@ -35,35 +37,40 @@ data:
     rpms:
       python-lit:
         rationale: Lit test runner for LLVM
-        ref: stream-llvm-toolset-rhel8-rhel-8.10.0
+        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
+        buildorder: 0
+      llvm-compat:
+        rationale: LLVM compatibility libraries
+        multilib: [x86_64]
+        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
         buildorder: 0
       llvm:
         rationale: LLVM tools and libraries
         multilib: [x86_64]
-        ref: stream-llvm-toolset-rhel8-rhel-8.10.0
+        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
         buildorder: 0
-      lld:
-        rationale: LLVM linker
-        multilib: [x86_64]
-        ref: stream-llvm-toolset-rhel8-rhel-8.10.0
-        buildorder: 1
       clang:
         rationale: clang tools and libraries 
         multilib: [x86_64]
-        ref: stream-llvm-toolset-rhel8-rhel-8.10.0
+        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-rhel8-rhel-8.10.0
+        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
         buildorder: 2
       libomp:
         rationale: LLVM OpenMP runtime
         multilib: [x86_64]
-        ref: stream-llvm-toolset-rhel8-rhel-8.10.0
+        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
         buildorder: 2
       lldb:
         rationale: lldb debugger
         multilib: [x86_64]
-        ref: stream-llvm-toolset-rhel8-rhel-8.10.0
+        ref: stream-llvm-toolset-rhel-next-rhel-8.10.0
         buildorder: 2