diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index fea04f8..8e1c1c6 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -26,17 +26,17 @@ data:
     rpms:
       jss:
         rationale: JSS packages
-        ref: stream-pki-10.6-rhel-8.6.0
+        ref: stream-pki-10.6-rhel-8.7.0
       ldapjdk:
         rationale: LDAP JDK packages
-        ref: stream-pki-10.6-rhel-8.6.0
+        ref: stream-pki-10.6-rhel-8.7.0
         buildorder: 1
       pki-core:
         rationale: PKI Core packages
-        ref: stream-pki-10.6-rhel-8.6.0
+        ref: stream-pki-10.6-rhel-8.7.0
         buildorder: 2
       tomcatjss:
         rationale: TomcatJSS packages
-        ref: stream-pki-10.6-rhel-8.6.0
+        ref: stream-pki-10.6-rhel-8.7.0
         buildorder: 1
 ...
diff --git a/pki-core.yaml b/pki-core.yaml
deleted file mode 100644
index c54addf..0000000
--- a/pki-core.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
----
-document: modulemd
-version: 2
-data:
-  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:
-      golang-ecosystem: [1.0]
-      pki-deps: [10.6]
-      platform: [el8.6.0]
-    requires:
-      pki-deps: [10.6]
-      platform: [el8]
-  references:
-    community: https://www.dogtagpki.org
-    documentation: https://www.dogtagpki.org
-    tracker: https://github.com/dogtagpki/pki/issues
-  components:
-    rpms:
-      jss:
-        rationale: JSS packages
-        ref: 4ee4cbdabba504242cb96435529a5d90c19c89d4
-      ldapjdk:
-        rationale: LDAP JDK packages
-        ref: 285988697f79856f61e55d3cbab310af98257048
-        buildorder: 1
-      pki-core:
-        rationale: PKI Core packages
-        ref: ccd67aa71478110091235c9c8a8fc0a623e6073e
-        buildorder: 2
-      tomcatjss:
-        rationale: TomcatJSS packages
-        ref: 4403c5590caf33848b96f43bb37d9572f9b693c2
-        buildorder: 1
-...
-