diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 1fe8bd1..a73ecba 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -49,18 +49,18 @@ data:
     buildopts:
         rpms:
             macros: |
-                %_with_bootstrap 1
+                %_with_bundled 1
     components:
         rpms:
             nodejs-packaging:
                 rationale: RPM Macros and Utilities for Node.js Packaging
                 buildorder: 10
-                ref: stream-16-rhel-8.5.0
+                ref: stream-16-rhel-8.7.0
             nodejs:
                 rationale: Javascript runtime and npm package manager.
                 buildorder: 100
-                ref: stream-16-rhel-8.5.0
+                ref: stream-16-rhel-8.7.0
             nodejs-nodemon:
                 rationale: Simple monitor script for use during development of a node.js app
                 buildorder: 200
-                ref: stream-16-rhel-8.5.0
+                ref: stream-16-rhel-8.7.0
diff --git a/nodejs.yaml b/nodejs.yaml
deleted file mode 100644
index b30fd5f..0000000
--- a/nodejs.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
----
-document: modulemd
-version: 2
-data:
-  name: nodejs
-  stream: "16"
-  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.5.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: ef3c8f38681d7de045c7992f259ed3d976952d9d
-        buildorder: 100
-      nodejs-nodemon:
-        rationale: Simple monitor script for use during development of a node.js app
-        ref: 07aa5515c36369b57f14abeb330e55ace58ec220
-        buildorder: 200
-      nodejs-packaging:
-        rationale: RPM Macros and Utilities for Node.js Packaging
-        ref: 0936d57728b9d360f2b5153c3d1e2aeb879b59c1
-        buildorder: 10
-...
-