diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index fbf522a..c7880ac 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -12,31 +12,31 @@ data:
     - MIT
   dependencies:
   - buildrequires:
+      platform: [el8]
       golang-ecosystem: [1.0]
       pki-deps: [10.6]
-      platform: [el8]
     requires:
-      pki-deps: [10.6]
       platform: [el8]
+      pki-deps: [10.6]
   references:
-    community: http://www.dogtagpki.org
-    documentation: http://www.dogtagpki.org
-    tracker: https://pagure.io/dogtagpki/issues
+    community: https://www.dogtagpki.org
+    documentation: https://www.dogtagpki.org
+    tracker: https://github.com/dogtagpki/pki/issues
   components:
     rpms:
       jss:
         rationale: JSS packages
-        ref: stream-pki-10.6-rhel-8.3.0
+        ref: stream-pki-10.6-rhel-8.4.0
       ldapjdk:
         rationale: LDAP JDK packages
-        ref: stream-pki-10.6-rhel-8.3.0
+        ref: stream-pki-10.6-rhel-8.4.0
         buildorder: 1
       pki-core:
         rationale: PKI Core packages
-        ref: stream-pki-10.6-rhel-8.3.0
+        ref: stream-pki-10.6-rhel-8.4.0
         buildorder: 2
       tomcatjss:
         rationale: TomcatJSS packages
-        ref: stream-pki-10.6-rhel-8.3.0
+        ref: stream-pki-10.6-rhel-8.4.0
         buildorder: 1
 ...
diff --git a/pki-core.yaml b/pki-core.yaml
deleted file mode 100644
index d7314a2..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.3.0]
-    requires:
-      pki-deps: [10.6]
-      platform: [el8]
-  references:
-    community: http://www.dogtagpki.org
-    documentation: http://www.dogtagpki.org
-    tracker: https://pagure.io/dogtagpki/issues
-  components:
-    rpms:
-      jss:
-        rationale: JSS packages
-        ref: 1928f4bdc06c1b9dd441bf3e3c57e213efb45f15
-      ldapjdk:
-        rationale: LDAP JDK packages
-        ref: 1b103369e53db9ed993af4593396362086e5d9e7
-        buildorder: 1
-      pki-core:
-        rationale: PKI Core packages
-        ref: cc72b0eca580385a96b444c9dde085b685ce0def
-        buildorder: 2
-      tomcatjss:
-        rationale: TomcatJSS packages
-        ref: 672fefb15b7f764bc1cee014a3713e1e623ec696
-        buildorder: 1
-...
-