diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 0b94577..aa2b840 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -1,64 +1,65 @@
+---
 document: modulemd
 version: 2
 data:
-    stream: 10
-    summary: Javascript runtime
-    description: >-
-        Node.js is a platform built on Chrome's JavaScript runtime
-        for easily building fast, scalable network applications.
-        Node.js uses an event-driven, non-blocking I/O model that
-        makes it lightweight and efficient, perfect for data-intensive
-        real-time applications that run across distributed devices.
-    license:
-        module:
-            - MIT
-    dependencies:
-        - buildrequires:
-            platform: [el8]
-          requires:
-            platform: [el8]
-    references:
-        community: http://nodejs.org
-        documentation: http://nodejs.org/en/docs
-        tracker: https://github.com/nodejs/node/issues
-    profiles:
-        common:
-            rpms:
-                - nodejs
-                - npm
-        development:
-            rpms:
-                - nodejs
-                - nodejs-devel
-                - npm
-        minimal:
-            rpms:
-                - nodejs
-        s2i:
-            rpms:
-                - nodejs
-                - npm
-                - nodejs-nodemon
-    api:
-        rpms:
-            - nodejs
-            - nodejs-devel
-            - npm
-    buildopts:
-        rpms:
-            macros: |
-                %_with_bootstrap 1
-    components:
-        rpms:
-            nodejs:
-                rationale: Javascript runtime and npm package manager.
-                buildorder: 10
-                ref: stream-10-rhel-8.1.0
-            nodejs-packaging:
-                rationale: RPM Macros and Utilities for Node.js Packaging
-                buildorder: 100
-                ref: rhel-8.0
-            nodejs-nodemon:
-                rationale: Simple monitor script for use during development of a node.js app
-                buildorder: 200
-                ref: rhel-8.0
+  stream: 10
+  summary: Javascript runtime
+  description: >-
+    Node.js is a platform built on Chrome's JavaScript runtime for easily building
+    fast, scalable network applications. Node.js uses an event-driven, non-blocking
+    I/O model that makes it lightweight and efficient, perfect for data-intensive
+    real-time applications that run across distributed devices.
+  license:
+    module:
+    - MIT
+  dependencies:
+  - buildrequires:
+      platform: [el8]
+    requires:
+      platform: [el8]
+  references:
+    community: http://nodejs.org
+    documentation: http://nodejs.org/en/docs
+    tracker: https://github.com/nodejs/node/issues
+  profiles:
+    common:
+      rpms:
+      - nodejs
+      - npm
+    development:
+      rpms:
+      - nodejs
+      - nodejs-devel
+      - npm
+    minimal:
+      rpms:
+      - nodejs
+    s2i:
+      rpms:
+      - nodejs
+      - nodejs-nodemon
+      - npm
+  api:
+    rpms:
+    - nodejs
+    - nodejs-devel
+    - npm
+  buildopts:
+    rpms:
+      macros: |
+        %_with_bootstrap 1
+  components:
+    rpms:
+      nodejs:
+        rationale: Javascript runtime and npm package manager.
+        ref: stream-10-rhel-8.2.0
+        buildorder: 10
+      nodejs-nodemon:
+        rationale: Simple monitor script for use during development of a node.js app
+        ref: stream-rhel-8.0-rhel-8.2.0
+        buildorder: 200
+      nodejs-packaging:
+        rationale: RPM Macros and Utilities for Node.js Packaging
+        ref: stream-rhel-8.0-rhel-8.2.0
+        buildorder: 100
+...
diff --git a/nodejs.yaml b/nodejs.yaml
deleted file mode 100644
index 3071c73..0000000
--- a/nodejs.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
----
-document: modulemd
-version: 2
-data:
-  name: nodejs
-  stream: 10
-  summary: Javascript runtime
-  description: >-
-    Node.js is a platform built on Chrome's JavaScript runtime for easily building
-    fast, scalable network applications. Node.js uses an event-driven, non-blocking
-    I/O model that makes it lightweight and efficient, perfect for data-intensive
-    real-time applications that run across distributed devices.
-  license:
-    module:
-    - MIT
-  dependencies:
-  - buildrequires:
-      platform: [el8.1.0]
-    requires:
-      platform: [el8]
-  references:
-    community: http://nodejs.org
-    documentation: http://nodejs.org/en/docs
-    tracker: https://github.com/nodejs/node/issues
-  profiles:
-    common:
-      rpms:
-      - nodejs
-      - npm
-    development:
-      rpms:
-      - nodejs
-      - nodejs-devel
-      - npm
-    minimal:
-      rpms:
-      - nodejs
-    s2i:
-      rpms:
-      - nodejs
-      - nodejs-nodemon
-      - npm
-  api:
-    rpms:
-    - nodejs
-    - nodejs-devel
-    - npm
-  buildopts:
-    rpms:
-      macros: >
-        %_with_bootstrap 1
-  components:
-    rpms:
-      nodejs:
-        rationale: Javascript runtime and npm package manager.
-        ref: fd3b1a4f2c31a996211494075939641eddd56c2d
-        buildorder: 10
-      nodejs-nodemon:
-        rationale: Simple monitor script for use during development of a node.js app
-        ref: 31d1e8f07ada1da75080a7d050a68ac3ba55a799
-        buildorder: 200
-      nodejs-packaging:
-        rationale: RPM Macros and Utilities for Node.js Packaging
-        ref: 072c286fc5ce5539a266627ee0199304d0dc83be
-        buildorder: 100
-...
-