diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 1342910..4f90c44 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -1,14 +1,17 @@
 document: modulemd
 version: 2
 data:
-    summary: PKI Core
-    description: A module for PKI Core packages.
+    name: pki-core
+    stream: 10.6
+    summary: PKI Core module for PKI 10.6 or later
+    description: A module for PKI Core packages for PKI version 10.6 or later.
     license:
         module:
           - MIT
     dependencies:
       - buildrequires:
             platform: [el8]
+            golang-ecosystem: [1.0]
             pki-deps: [10.6]
         requires:
             platform: [el8]
@@ -21,16 +24,16 @@ data:
         rpms:
             jss:
                 rationale: JSS packages
-                ref: stream-pki-10.6
+                ref: stream-pki-10.7-rhel-8.1.0
             ldapjdk:
                 rationale: LDAP JDK packages
-                ref: stream-pki-10.6
+                ref: stream-pki-10.7-rhel-8.1.0
                 buildorder: 1
             tomcatjss:
                 rationale: TomcatJSS packages
-                ref: stream-pki-10.6
+                ref: stream-pki-10.7-rhel-8.1.0
                 buildorder: 1
             pki-core:
                 rationale: PKI Core packages
-                ref: stream-pki-10.6
+                ref: stream-pki-10.7-rhel-8.1.0
                 buildorder: 2
diff --git a/pki-core.yaml b/pki-core.yaml
deleted file mode 100644
index ea2f6c3..0000000
--- a/pki-core.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-document: modulemd
-version: 2
-data:
-  summary: PKI Core
-  description: A module for PKI Core packages.
-  license:
-    module:
-    - MIT
-  dependencies:
-  - buildrequires:
-      platform:
-      - el8.0.0
-      pki-deps:
-      - 10.6
-    requires:
-      platform:
-      - el8
-      pki-deps:
-      - 10.6
-  references:
-    community: http://www.dogtagpki.org
-    documentation: http://www.dogtagpki.org
-    tracker: https://pagure.io/dogtagpki/issues
-  components:
-    rpms:
-      jss:
-        rationale: JSS packages
-        ref: ce3edae4af319302a852ade8478ae2a5ac7b823d
-      ldapjdk:
-        rationale: LDAP JDK packages
-        ref: f0a60802ded108dc3ec90462839835f9bf92cd53
-        buildorder: 1
-      tomcatjss:
-        rationale: TomcatJSS packages
-        ref: 3a443057db7c2664cbb6e0ea383b3fee56ae76e6
-        buildorder: 1
-      pki-core:
-        rationale: PKI Core packages
-        ref: 469e9d1d43435cb23acf5a4fd8ab8a79206c562f
-        buildorder: 2
-  name: pki-core
-  stream: '10.6'