diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 5bf2732..e560b80 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -33,42 +33,42 @@ data:
       - lld-libs
   components:
     rpms:
-      llvm-toolset:
-        rationale: Meta package for llvm-toolset providing scl enable scripts.
-        multilib: [x86_64]
-        ref: stream-rhel-8-rhel-8.7.0
-        buildorder: 0
       python-lit:
         rationale: Lit test runner for LLVM
-        ref: stream-rhel-8-rhel-8.7.0
+        ref: stream-rhel-8-rhel-8.8.0
         buildorder: 0
       llvm:
         rationale: LLVM tools and libraries
         multilib: [x86_64]
-        ref: stream-rhel-8-rhel-8.7.0
+        ref: stream-rhel-8-rhel-8.8.0
+        buildorder: 0
+      llvm-compat:
+        rationale: LLVM tools and libraries
+        multilib: [x86_64]
+        ref: stream-rhel-8-rhel-8.8.0
         buildorder: 0
       compiler-rt:
         rationale: LLVM compiler intrinsic and sanitizer libraries 
         multilib: [x86_64]
-        ref: stream-rhel-8-rhel-8.7.0
+        ref: stream-rhel-8-rhel-8.8.0
         buildorder: 1
       lld:
         rationale: LLVM linker
         multilib: [x86_64]
-        ref: stream-rhel-8-rhel-8.7.0
+        ref: stream-rhel-8-rhel-8.8.0
         buildorder: 1
       clang:
         rationale: clang tools and libraries 
         multilib: [x86_64]
-        ref: stream-rhel-8-rhel-8.7.0
+        ref: stream-rhel-8-rhel-8.8.0
         buildorder: 1
       libomp:
         rationale: LLVM OpenMP runtime
         multilib: [x86_64]
-        ref: stream-rhel-8-rhel-8.7.0
+        ref: stream-rhel-8-rhel-8.8.0
         buildorder: 2
       lldb:
         rationale: lldb debugger
         multilib: [x86_64]
-        ref: stream-rhel-8-rhel-8.7.0
+        ref: stream-rhel-8-rhel-8.8.0
         buildorder: 2
diff --git a/llvm-toolset.yaml b/llvm-toolset.yaml
deleted file mode 100644
index 3d7fb71..0000000
--- a/llvm-toolset.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
----
-document: modulemd
-version: 2
-data:
-  name: llvm-toolset
-  stream: "rhel8"
-  summary: LLVM
-  description: >-
-    LLVM Tools and libraries
-  license:
-    module:
-    - MIT
-  dependencies:
-  - buildrequires:
-      platform: [el8.7.0]
-    requires:
-      platform: [el8]
-  profiles:
-    common:
-      rpms:
-      - llvm-toolset
-  api:
-    rpms:
-    - clang
-    - clang-analyzer
-    - clang-devel
-    - clang-libs
-    - clang-tools-extra
-    - git-clang-format
-    - lld
-    - lld-libs
-    - lldb
-    - lldb-devel
-    - llvm
-    - llvm-devel
-    - llvm-libs
-  components:
-    rpms:
-      clang:
-        rationale: clang tools and libraries
-        ref: fa0eb4201547f2f34b372ecb702562ce2ccaf896
-        buildorder: 1
-        multilib: [x86_64]
-      compiler-rt:
-        rationale: LLVM compiler intrinsic and sanitizer libraries
-        ref: a7eb32362ede7bfaf6caddaada2a3bc8019ba4b4
-        buildorder: 1
-        multilib: [x86_64]
-      libomp:
-        rationale: LLVM OpenMP runtime
-        ref: 37ed999a409ec66f8c7ac343af0ff341fa2a153d
-        buildorder: 2
-        multilib: [x86_64]
-      lld:
-        rationale: LLVM linker
-        ref: c0e87b6e6616fac402d99237cc6c361fc5d6b7fa
-        buildorder: 1
-        multilib: [x86_64]
-      lldb:
-        rationale: lldb debugger
-        ref: a33889d2024f0c888d9b8eacc328a4a2735048df
-        buildorder: 2
-        multilib: [x86_64]
-      llvm:
-        rationale: LLVM tools and libraries
-        ref: 782edfef61602b093e1795c4f7cc142c62fc122b
-        multilib: [x86_64]
-      llvm-toolset:
-        rationale: Meta package for llvm-toolset providing scl enable scripts.
-        ref: d2facb5feff2c28c0d9d02faac831dbba31ba26c
-        multilib: [x86_64]
-      python-lit:
-        rationale: Lit test runner for LLVM
-        ref: a6470903c963798d89fb9f25d0c464e16e18cdce
-...
-