diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index b01ed53..76e64d8 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -36,39 +36,39 @@ 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
       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 fc4d504..0000000
--- a/llvm-toolset.yaml
+++ /dev/null
@@ -1,75 +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-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: fb69255e181bab9f512476ce75e6b4336e1968f5
-        buildorder: 1
-        multilib: [x86_64]
-      compiler-rt:
-        rationale: LLVM compiler intrinsic and sanitizer libraries
-        ref: e3a45eafe301d514886439a31938259e9a4906ff
-        buildorder: 1
-        multilib: [x86_64]
-      libomp:
-        rationale: LLVM OpenMP runtime
-        ref: 25fb9961a03e9fa74b2809738d88c11b59b6dc0e
-        multilib: [x86_64]
-      lld:
-        rationale: LLVM linker
-        ref: 04e441883d3cf9c413bb0a8c384445e1a570c390
-        buildorder: 1
-        multilib: [x86_64]
-      lldb:
-        rationale: lldb debugger
-        ref: f5004023567e3ba4120c2934b6daef287bcf4bdc
-        buildorder: 2
-        multilib: [x86_64]
-      llvm:
-        rationale: LLVM tools and libraries
-        ref: 8cfbb4c33d4b163892abceaa98571babe6892611
-        multilib: [x86_64]
-      llvm-toolset:
-        rationale: Meta package for llvm-toolset providing scl enable scripts.
-        ref: 0d10f6a43279f4e973d147ecee34422e1234e824
-        multilib: [x86_64]
-      python-lit:
-        rationale: Lit test runner for LLVM
-        ref: ef59b4eff4a1e9697b822135f121aab04dbc79ce
-...
-