diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index b01ed53..cfcd6ab 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.4.0
+        ref: stream-rhel-8-rhel-8.5.0
         buildorder: 0
       python-lit:
         rationale: Lit test runner for LLVM
-        ref: stream-rhel-8-rhel-8.4.0
+        ref: stream-rhel-8-rhel-8.5.0
         buildorder: 0
       libomp:
         rationale: LLVM OpenMP runtime
         multilib: [x86_64]
-        ref: stream-rhel-8-rhel-8.4.0
+        ref: stream-rhel-8-rhel-8.5.0
         buildorder: 0
       llvm:
         rationale: LLVM tools and libraries 
         multilib: [x86_64]
-        ref: stream-rhel-8-rhel-8.4.0
+        ref: stream-rhel-8-rhel-8.5.0
+        buildorder: 0
+      llvm-compat:
+        rationale: LLVM compatibility libs for transition user to a new llvm version
+        multilib: [x86_64]
+        ref: stream-rhel-8-rhel-8.5.0
         buildorder: 0
       compiler-rt:
         rationale: LLVM compiler intrinsic and sanitizer libraries 
         multilib: [x86_64]
-        ref: stream-rhel-8-rhel-8.4.0
+        ref: stream-rhel-8-rhel-8.5.0
         buildorder: 1
       lld:
         rationale: LLVM linker
         multilib: [x86_64]
-        ref: stream-rhel-8-rhel-8.4.0
+        ref: stream-rhel-8-rhel-8.5.0
         buildorder: 1
       clang:
         rationale: clang tools and libraries 
         multilib: [x86_64]
-        ref: stream-rhel-8-rhel-8.4.0
+        ref: stream-rhel-8-rhel-8.5.0
         buildorder: 1
       lldb:
         rationale: lldb debugger
         multilib: [x86_64]
-        ref: stream-rhel-8-rhel-8.4.0
+        ref: stream-rhel-8-rhel-8.5.0
         buildorder: 2
diff --git a/llvm-toolset.yaml b/llvm-toolset.yaml
deleted file mode 100644
index 8c69c71..0000000
--- a/llvm-toolset.yaml
+++ /dev/null
@@ -1,74 +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.4.0]
-      requires:
-        platform: [el8]
-  profiles:
-    common:
-      rpms:
-        - llvm-toolset
-  api:
-    rpms:
-      - clang
-      - clang-analyzer
-      - clang-libs
-      - clang-devel
-      - clang-tools-extra
-      - git-clang-format
-      - lldb
-      - lldb-devel
-      - llvm
-      - llvm-devel
-      - llvm-libs
-      - lld
-      - lld-libs
-  components:
-    rpms:
-      llvm-toolset:
-        rationale: Meta package for llvm-toolset providing scl enable scripts.
-        multilib: [x86_64]
-        ref: d605f4b1b8bdba738e79fe37b23dc2dbeba584c7
-        buildorder: 0
-      python-lit:
-        rationale: Lit test runner for LLVM
-        ref: ef59b4eff4a1e9697b822135f121aab04dbc79ce
-        buildorder: 0
-      libomp:
-        rationale: LLVM OpenMP runtime
-        multilib: [x86_64]
-        ref: 91d1894a2238f7e5766a0a7468fca81300578888
-        buildorder: 0
-      llvm:
-        rationale: LLVM tools and libraries
-        multilib: [x86_64]
-        ref: 158546899df118d39389e0086d276b1cbe7d4eab
-        buildorder: 0
-      compiler-rt:
-        rationale: LLVM compiler intrinsic and sanitizer libraries
-        multilib: [x86_64]
-        ref: 8ca008752ea93232b76228765e8b08342e675f6a
-        buildorder: 1
-      lld:
-        rationale: LLVM linker
-        multilib: [x86_64]
-        ref: 5a49621f72c4befd3f28dd96986437d542ba49ca
-        buildorder: 1
-      clang:
-        rationale: clang tools and libraries
-        multilib: [x86_64]
-        ref: 78ae708b18beef6d296ef85d64af96dbf69b87c7
-        buildorder: 1
-      lldb:
-        rationale: lldb debugger
-        multilib: [x86_64]
-        ref: 1ae3716de51e70b1fa64b65fe70d3fb34dc34867
-        buildorder: 2