diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index e7e6319..58c7e5b 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -36,39 +36,44 @@ data:
       llvm-toolset:
         rationale: Meta package for llvm-toolset providing scl enable scripts.
         multilib: [x86_64]
-        ref: stream-rhel-8-rhel-8.6.0
+        ref: stream-rhel-8-rhel-8.7.0
         buildorder: 0
       python-lit:
         rationale: Lit test runner for LLVM
-        ref: stream-rhel-8-rhel-8.6.0
+        ref: stream-rhel-8-rhel-8.7.0
         buildorder: 0
       llvm:
-        rationale: LLVM tools and libraries 
+        rationale: LLVM tools and libraries
         multilib: [x86_64]
-        ref: stream-rhel-8-rhel-8.6.0
+        ref: stream-rhel-8-rhel-8.7.0
+        buildorder: 0
+      llvm-compat:
+        rartionale: LLVM compatibility libs for transition user to a new llvm version
+        multilib: [x86_64]
+        ref: stream-rhel-8-rhel-8.7.0
         buildorder: 0
       compiler-rt:
         rationale: LLVM compiler intrinsic and sanitizer libraries 
         multilib: [x86_64]
-        ref: stream-rhel-8-rhel-8.6.0
+        ref: stream-rhel-8-rhel-8.7.0
         buildorder: 1
       lld:
         rationale: LLVM linker
         multilib: [x86_64]
-        ref: stream-rhel-8-rhel-8.6.0
+        ref: stream-rhel-8-rhel-8.7.0
         buildorder: 1
       clang:
         rationale: clang tools and libraries 
         multilib: [x86_64]
-        ref: stream-rhel-8-rhel-8.6.0
+        ref: stream-rhel-8-rhel-8.7.0
         buildorder: 1
       libomp:
         rationale: LLVM OpenMP runtime
         multilib: [x86_64]
-        ref: stream-rhel-8-rhel-8.6.0
+        ref: stream-rhel-8-rhel-8.7.0
         buildorder: 2
       lldb:
         rationale: lldb debugger
         multilib: [x86_64]
-        ref: stream-rhel-8-rhel-8.6.0
+        ref: stream-rhel-8-rhel-8.7.0
         buildorder: 2
diff --git a/llvm-toolset.yaml b/llvm-toolset.yaml
deleted file mode 100644
index c6f4f27..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.6.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: 33d02d7a9d0f863d096f93b8bf4890981f40e906
-        buildorder: 1
-        multilib: [x86_64]
-      compiler-rt:
-        rationale: LLVM compiler intrinsic and sanitizer libraries
-        ref: 22e777dc8abb333bc3e1d907f4d515ecc42a3c81
-        buildorder: 1
-        multilib: [x86_64]
-      libomp:
-        rationale: LLVM OpenMP runtime
-        ref: 1a3c6043f696afc379a34b965d1991da69b5e700
-        buildorder: 2
-        multilib: [x86_64]
-      lld:
-        rationale: LLVM linker
-        ref: 91ecdc3e045096367981cb3342056b67edb5d269
-        buildorder: 1
-        multilib: [x86_64]
-      lldb:
-        rationale: lldb debugger
-        ref: 99aa8182a657bec1e6cd660a0e1887e8c8e3a200
-        buildorder: 2
-        multilib: [x86_64]
-      llvm:
-        rationale: LLVM tools and libraries
-        ref: 7d161a3fb9ac31c542b81d69ec59fb9316e0cbaf
-        multilib: [x86_64]
-      llvm-toolset:
-        rationale: Meta package for llvm-toolset providing scl enable scripts.
-        ref: 34d94e25124d2ba5deacce4cc73736ff88d83664
-        multilib: [x86_64]
-      python-lit:
-        rationale: Lit test runner for LLVM
-        ref: 990eb45ac5801a32c47e9c38025f6753adb69916
-...
-