diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 0028c30..672513d 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -1,13 +1,15 @@
 document: modulemd
 version: 2
 data:
+  name: llvm-toolset
+  stream: rhel8
   summary: LLVM
   description: LLVM Tools and libraries
   license:
     module: [MIT]
   dependencies:
     - buildrequires:
-        platform: [el8]
+        platform: [el8.0.0]
       requires:
         platform: [el8]
   profiles:
@@ -34,39 +36,39 @@ data:
       llvm-toolset:
         rationale: Meta package for llvm-toolset providing scl enable scripts.
         multilib: [x86_64]
-        ref: stream-rhel-8
+        ref: stream-rhel-8-rhel-8.0.0
         buildorder: 0
       python-lit:
         rationale: Lit test runner for LLVM
-        ref: stream-rhel-8
+        ref: stream-rhel-8-rhel-8.0.0
         buildorder: 0
       libomp:
         rationale: LLVM OpenMP runtime
         multilib: [x86_64]
-        ref: stream-rhel-8
+        ref: stream-rhel-8-rhel-8.0.0
         buildorder: 0
       llvm:
         rationale: LLVM tools and libraries 
         multilib: [x86_64]
-        ref: stream-rhel-8
+        ref: stream-rhel-8-rhel-8.0.0
         buildorder: 0
       compiler-rt:
         rationale: LLVM compiler intrinsic and sanitizer libraries 
         multilib: [x86_64]
-        ref: stream-rhel-8
+        ref: stream-rhel-8-rhel-8.0.0
         buildorder: 1
       lld:
         rationale: LLVM linker
         multilib: [x86_64]
-        ref: stream-rhel-8
+        ref: stream-rhel-8-rhel-8.0.0
         buildorder: 1
       clang:
         rationale: clang tools and libraries 
         multilib: [x86_64]
-        ref: stream-rhel-8
+        ref: stream-rhel-8-rhel-8.0.0
         buildorder: 2
       lldb:
         rationale: lldb debugger
         multilib: [x86_64]
-        ref: stream-rhel-8
+        ref: stream-rhel-8-rhel-8.0.0
         buildorder: 3
diff --git a/llvm-toolset.yaml b/llvm-toolset.yaml
deleted file mode 100644
index 9882f15..0000000
--- a/llvm-toolset.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
-document: modulemd
-version: 2
-data:
-  summary: LLVM
-  description: LLVM Tools and libraries
-  license:
-    module:
-    - MIT
-  dependencies:
-  - buildrequires:
-      platform:
-      - el8.0.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: b239b62764b7a865391517892f84b8073efe7f60
-        buildorder: 0
-      python-lit:
-        rationale: Lit test runner for LLVM
-        ref: ec96cb788140ead77ef1186c4ce61c32700c3b2b
-        buildorder: 0
-      libomp:
-        rationale: LLVM OpenMP runtime
-        multilib:
-        - x86_64
-        ref: d97994b1566c6704e2735b14836f92e7eeff81fc
-        buildorder: 0
-      llvm:
-        rationale: LLVM tools and libraries
-        multilib:
-        - x86_64
-        ref: ef93f837c77a69baf54b13056f834dbd95177adf
-        buildorder: 0
-      compiler-rt:
-        rationale: LLVM compiler intrinsic and sanitizer libraries
-        multilib:
-        - x86_64
-        ref: 212512536d2da30016ca2b336c87b82237928bc4
-        buildorder: 1
-      lld:
-        rationale: LLVM linker
-        multilib:
-        - x86_64
-        ref: 074ff8a952ae5087c3b269494cb53e1826f498c6
-        buildorder: 1
-      clang:
-        rationale: clang tools and libraries
-        multilib:
-        - x86_64
-        ref: edce023ed3aa4883021930819404c3082f21ce02
-        buildorder: 2
-      lldb:
-        rationale: lldb debugger
-        multilib:
-        - x86_64
-        ref: 056a812f1645a996b3a3892ff9477cc7df9847a2
-        buildorder: 3
-  name: llvm-toolset
-  stream: rhel8