diff --git a/gating.yaml b/gating.yaml
index 656027f..65e977b 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -4,5 +4,6 @@ product_versions:
 decision_context: osci_compose_gate_modules
 subject_type: redhat-module
 rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.redhat-module.tier1.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.redhat-module.tier0-tmt-x86_64-aarch64.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.redhat-module.tier0-tmt-s390x-ppc64le.functional}
   - !PassingTestCaseRule {test_case_name: osci.redhat-module.rebuild.validation}
diff --git a/kernel-testing.yaml b/kernel-testing.yaml
index c37ed98..3807059 100644
--- a/kernel-testing.yaml
+++ b/kernel-testing.yaml
@@ -10,6 +10,7 @@ data:
   dependencies:
     - buildrequires:
         platform: [el8]
+        swig: [4.0]
       requires:
         platform: [el8]
   profiles:
@@ -35,37 +36,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: rhel-8-main
diff --git a/llvm-toolset.yaml b/llvm-toolset.yaml
index aa8a11b..df5cc68 100644
--- a/llvm-toolset.yaml
+++ b/llvm-toolset.yaml
@@ -10,6 +10,7 @@ data:
   dependencies:
     - buildrequires:
         platform: [el8]
+        swig: [4.0]
       requires:
         platform: [el8]
   profiles:
@@ -35,35 +36,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