diff --git a/llvm-toolset.yaml b/llvm-toolset.yaml
index 2c3bc3c..7c0c16c 100644
--- a/llvm-toolset.yaml
+++ b/llvm-toolset.yaml
@@ -1,75 +1,74 @@
----
 document: modulemd
 version: 2
 data:
   name: llvm-toolset
   stream: rhel8
   summary: LLVM
-  description: >-
-    LLVM Tools and libraries
+  description: LLVM Tools and libraries
   license:
-    module:
-    - MIT
+    module: [MIT]
   dependencies:
-  - buildrequires:
-      platform: [el8.2.0]
-    requires:
-      platform: [el8]
+    - buildrequires:
+        platform: [el8.2.0]
+      requires:
+        platform: [el8]
   profiles:
     common:
       rpms:
-      - llvm-toolset
+        - 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
+      - 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:
-      clang:
-        rationale: clang tools and libraries
-        ref: b6490f0a0f49224c36a153c514f9d0d802bbe5e9
-        buildorder: 1
-        multilib: [x86_64]
-      compiler-rt:
-        rationale: LLVM compiler intrinsic and sanitizer libraries
-        ref: 26d72b91d355728a879462dff5973313dc332d60
-        buildorder: 1
+      llvm-toolset:
+        rationale: Meta package for llvm-toolset providing scl enable scripts.
         multilib: [x86_64]
+        ref: 10fe5562186b146f746e9c6f129aba788ce424bd
+        buildorder: 0
+      python-lit:
+        rationale: Lit test runner for LLVM
+        ref: 2b856783b5ffab0920be8edc15cc34f3d99889df
+        buildorder: 0
       libomp:
         rationale: LLVM OpenMP runtime
-        ref: afb2a65dcdc4ce04c2f81ae9f1d2b49dfbe6a4ab
         multilib: [x86_64]
+        ref: 99a6c257ee303c003f1ee5173489cbf81bb810a3
+        buildorder: 0
+      llvm:
+        rationale: LLVM tools and libraries
+        multilib: [x86_64]
+        ref: 1e30ac6a36822920a324a9762f0c5d71d795453f
+        buildorder: 0
+      compiler-rt:
+        rationale: LLVM compiler intrinsic and sanitizer libraries
+        multilib: [x86_64]
+        ref: 286992764b6f0480b9c7c3bbed4b23ad5fcb7e4f
+        buildorder: 1
       lld:
         rationale: LLVM linker
-        ref: f79958d00446cc8070d2f04526faa435fd2734e9
+        multilib: [x86_64]
+        ref: 1d4e6c11a012c1c011671bb8ffcf3bcce08d6165
         buildorder: 1
+      clang:
+        rationale: clang tools and libraries
         multilib: [x86_64]
+        ref: fa4e0258456e5055992b82a9559f5482a314cf20
+        buildorder: 1
       lldb:
         rationale: lldb debugger
-        ref: 98e1e94fad783aec0be435746287392e2979730e
-        buildorder: 2
-        multilib: [x86_64]
-      llvm:
-        rationale: LLVM tools and libraries
-        ref: 4fb9794589700922c832d2337f01c04bec684b2f
-        multilib: [x86_64]
-      llvm-toolset:
-        rationale: Meta package for llvm-toolset providing scl enable scripts.
-        ref: 48022447cf0c26b64081355b587b3f619756197f
         multilib: [x86_64]
-      python-lit:
-        rationale: Lit test runner for LLVM
-        ref: 287662c2f687638612749c0b21b04cda8dfd0748
-...
-
+        ref: 513308960827f3654776fe3ffc4afdf62e3d0b0b
+        buildorder: 2