diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 8a1341e..68d6229 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -1,282 +1,254 @@
+---
 document: modulemd
 version: 2
 data:
-    name: pki-deps
-    stream: 10.6
-    summary: PKI Dependencies module for PKI 10.6 or later
-    description: A module to contain dependencies for PKI version 10.6 or later.
-    license:
-        module:
-          - MIT
-    dependencies:
-      - buildrequires:
-            platform: [el8]
-        requires:
-            platform: [el8]
-    references:
-        community: http://www.dogtagpki.org
-        documentation: http://www.dogtagpki.org
-        tracker: https://pagure.io/dogtagpki/issues
-    filter:
-        rpms:
-            - apache-commons-collections-javadoc
-            - apache-commons-collections-testframework
-            - apache-commons-lang-javadoc
-            - bea-stax
-            - bea-stax-javadoc
-            # - codemodel
-            # - codemodel-javadoc
-            - fasterxml-oss-parent
-            - glassfish-fastinfoset-javadoc
-            - glassfish-jax-rs-api
-            - glassfish-jax-rs-api-javadoc
-            - glassfish-jaxb
-            - glassfish-jaxb-api-javadoc
-            - glassfish-jaxb-bom
-            - glassfish-jaxb-bom-ext
-            - glassfish-jaxb-codemodel
-            - glassfish-jaxb-codemodel-annotation-compiler
-            - glassfish-jaxb-codemodel-parent
-            - glassfish-jaxb-external-parent
-            - glassfish-jaxb-parent
-            - glassfish-jaxb-rngom
-            - glassfish-jaxb-runtime-parent
-            - glassfish-jaxb-txw-parent
-            # - import-properties-plugin
-            # - istack-commons
-            # - istack-commons-buildtools
-            # - istack-commons-javadoc
-            # - istack-commons-maven-plugin
-            # - istack-commons-runtime
-            # - istack-commons-test
-            # - istack-commons-tools
-            - jackson-bom
-            - jackson-jaxrs-providers-parent
-            - jackson-parent
-            - jackson-annotations-javadoc
-            - jackson-core-javadoc
-            - jackson-databind-javadoc
-            - jackson-jaxrs-providers-datatypes
-            - jackson-jaxrs-providers-javadoc
-            - jackson-module-jaxb-annotations-javadoc
-            - jakarta-commons-httpclient-demo
-            - jakarta-commons-httpclient-javadoc
-            - jakarta-commons-httpclient-manual
-            - jcl-over-slf4j
-            - jul-to-slf4j
-            - log4j-over-slf4j
-            - msv-demo
-            - msv-javadoc
-            - msv-manual
-            - msv-msv
-            - msv-rngconv
-            - msv-xmlgen
-            - msv-xsdlib
-            - relaxngDatatype-javadoc
-            - relaxngcc
-            - relaxngcc-javadoc
-            - resteasy-javadoc
-            - slf4j-ext
-            - slf4j-javadoc
-            - slf4j-jcl
-            - slf4j-log4j12
-            - slf4j-manual
-            - slf4j-sources
-            - stax-ex-javadoc
-            - velocity-demo
-            - velocity-javadoc
-            - velocity-manual
-            - xalan-j2-demo
-            - xalan-j2-javadoc
-            - xalan-j2-manual
-            - xalan-j2-xsltc
-            - xerces-j2-demo
-            - xerces-j2-javadoc
-            - xml-commons-apis-javadoc
-            - xml-commons-apis-manual
-            - xml-commons-resolver-javadoc
-            - xml-stylebook
-            - xml-stylebook-demo
-            - xml-stylebook-javadoc
-            - xmlstreambuffer-javadoc
-            - xsom-javadoc
-    buildopts:
-        rpms:
-            macros: |
-                %_with_xmvn_javadoc 1
-                %_without_asciidoc 1
-                %_without_avalon 1
-                %_without_bouncycastle 1
-                %_without_cython 1
-                %_without_dafsa 1
-                %_without_desktop 1
-                %_without_doxygen 1
-                %_without_dtd 1
-                %_without_eclipse 1
-                %_without_ehcache 1
-                %_without_emacs 1
-                %_without_equinox 1
-                %_without_fop 1
-                %_without_ftp 1
-                %_without_gradle 1
-                %_without_groovy 1
-                %_without_hadoop 1
-                %_without_hsqldb 1
-                %_without_itext 1
-                %_without_jackson 1
-                %_without_jmh 1
-                %_without_jna 1
-                %_without_jpa 1
-                %_without_junit5 1
-                %_without_logback 1
-                %_without_markdown 1
-                %_without_memcached 1
-                %_without_memoryfilesystem 1
-                %_without_obr 1
-                %_without_python 1
-                %_without_reporting 1
-                %_without_scm 1
-                %_without_snappy 1
-                %_without_spring 1
-                %_without_ssh 1
-                %_without_testlib 1
-    components:
-        rpms:
-            # codemodel:
-            #    rationale: Java library for code generators
-            #        BuildRequired by istack-commons.
-            #    ref: rhel-8.1.0
-            fasterxml-oss-parent:
-                rationale: FasterXML parent pom
-                    BuildRequired by jackson-parent.
-                ref: rhel-8.1.0
-            python-nss:
-                rationale: Python binding for NSS
-                    Provides python-nss for pki-base-java.
-                ref: stream-pki-10.6-rhel-8.1.0
-            apache-commons-collections:
-                rationale: Apache Commons Collections packages
-                ref: stream-javapackages-tools-201801-rhel-8.1.0
-            apache-commons-lang:
-                rationale: Apache Commons Lang packages
-                ref: stream-javapackages-tools-201801-rhel-8.1.0
-            bea-stax:
-                rationale: BEA StAX packages
-                ref: stream-javapackages-tools-201801
-            glassfish-jaxb-api:
-                rationale: GlassFish JAXB API packages
-                ref: stream-javapackages-tools-201801
-            glassfish-jax-rs-api:
-                rationale: GlassFish JAX-RS API packages
-                ref: stream-pki-10.6-rhel-8.1.0
-            jakarta-commons-httpclient:
-                rationale: Jakarta Commons HTTPClient packages
-                ref: stream-javapackages-tools-201801-rhel-8.1.0
-            javassist:
-                rationale: Javassist packages
-                ref: stream-javapackages-tools-201801-rhel-8.1.0
-            relaxngDatatype:
-                rationale: RELAX NG packages
-                ref: stream-javapackages-tools-201801
-            velocity:
-                rationale: Velocity packages
-                ref: stream-javapackages-tools-201801-rhel-8.1.0
-            xerces-j2:
-                rationale: Xerces packages
-                ref: stream-javapackages-tools-201801-rhel-8.1.0
-            xml-commons-apis:
-                rationale: XML Commons APIs packages
-                ref: stream-javapackages-tools-201801-rhel-8.1.0
-            xml-commons-resolver:
-                rationale: XML Commons Resolver packages
-                ref: stream-javapackages-tools-201801-rhel-8.1.0
-            xml-stylebook:
-                rationale: XML Stylebook packages
-                ref: stream-javapackages-tools-201801
-            slf4j:
-                rationale: Simple Logging Facade for Java
-                    Provides slf4j and slf4j-jdk14 for pki-base-java.
-                ref: stream-maven-3.5-rhel-8.1.0
-            pki-servlet-engine:
-                rationale: PKI Servlet Engine packages
-                ref: stream-pki-10.7
-            xalan-j2:
-                rationale: Xalan packages
-                    Provides xalan-j2 for pki-base-java.
-                ref: stream-javapackages-tools-201801-rhel-8.1.0
-                buildorder: 1
-            msv:
-                rationale: Multi-Schema Validator
-                    Requires relaxngDatatype.
-                ref: stream-javapackages-tools-201801
-                buildorder: 1
-            # istack-commons:
-            #    rationale: Common code for some Glassfish projects
-            #        BuildRequires codemodel.
-            #        BuildRequired by glassfish-jaxb.
-            #    ref: rhel-8.1.0
-            #    buildorder: 1
-            stax-ex:
-                rationale: StAX API extensions
-                    Requires bea-stax.
-                ref: stream-pki-10.6-rhel-8.1.0
-                buildorder: 2
-            relaxngcc:
-                rationale: RELAX NG Compiler Compiler
-                    Requires msv.
-                ref: rhel-8.0.0
-                buildorder: 2
-            xmlstreambuffer:
-                rationale: XML Stream Buffer package
-                    Requires stax-ex.
-                ref: stream-pki-10.6-rhel-8.1.0
-                buildorder: 3
-            xsom:
-                rationale: XML Schema Object Model (XSOM)
-                    Requires relaxngcc.
-                ref: rhel-8.0.0
-                buildorder: 3
-            glassfish-fastinfoset:
-                rationale: Fast XML Information Set package
-                    Requires xmlstreambuffer, xsom.
-                ref: stream-pki-10.6-rhel-8.1.0
-                buildorder: 4
-            glassfish-jaxb:
-                rationale: JAXB Reference Implementation
-                    BuildRequires istack-commons.
-                    Requires glassfish-fastinfoset, glassfish-jaxb-api.
-                ref: stream-pki-10.6-rhel-8.1.0
-                buildorder: 5
-            jackson-parent:
-                rationale: Jackson Parent POM packages
-                    BuildRequires fasterxml-oss-parent.
-                ref: stream-pki-10.6-rhel-8.1.0
-                buildorder: 10
-            jackson-bom:
-                rationale: Jackson Bill-of-Materials POM packages
-                ref: stream-pki-10.6-rhel-8.1.0
-                buildorder: 11
-            jackson-core:
-                rationale: Jackson Core packages
-                ref: stream-pki-10.6-rhel-8.1.0
-                buildorder: 12
-            jackson-annotations:
-                rationale: Jackson Annotations packages
-                ref: stream-pki-10.6-rhel-8.1.0
-                buildorder: 13
-            jackson-databind:
-                rationale: Jackson Data-binding packages
-                ref: stream-pki-10.6-rhel-8.1.0
-                buildorder: 14
-            jackson-module-jaxb-annotations:
-                rationale: Jackson JAXB Annotations packages
-                ref: stream-pki-10.6-rhel-8.1.0
-                buildorder: 15
-            jackson-jaxrs-providers:
-                rationale: Jackson JAX-RS Providers packages
-                ref: stream-pki-10.6-rhel-8.1.0
-                buildorder: 16
-            resteasy:
-                rationale: RESTEasy packages
-                ref: stream-pki-10.6-rhel-8.1.0
-                buildorder: 17
+  name: pki-deps
+  stream: 10.6
+  summary: PKI Dependencies module for PKI 10.6 or later
+  description: >-
+    A module to contain dependencies for PKI version 10.6 or later.
+  license:
+    module:
+    - MIT
+  dependencies:
+  - buildrequires:
+      platform: [el8]
+    requires:
+      platform: [el8]
+  references:
+    community: http://www.dogtagpki.org
+    documentation: http://www.dogtagpki.org
+    tracker: https://pagure.io/dogtagpki/issues
+  filter:
+    rpms:
+    - apache-commons-collections-javadoc
+    - apache-commons-collections-testframework
+    - apache-commons-lang-javadoc
+    - bea-stax
+    - bea-stax-javadoc
+    - fasterxml-oss-parent
+    - glassfish-fastinfoset-javadoc
+    - glassfish-jax-rs-api
+    - glassfish-jax-rs-api-javadoc
+    - glassfish-jaxb
+    - glassfish-jaxb-api-javadoc
+    - glassfish-jaxb-bom
+    - glassfish-jaxb-bom-ext
+    - glassfish-jaxb-codemodel
+    - glassfish-jaxb-codemodel-annotation-compiler
+    - glassfish-jaxb-codemodel-parent
+    - glassfish-jaxb-external-parent
+    - glassfish-jaxb-parent
+    - glassfish-jaxb-rngom
+    - glassfish-jaxb-runtime-parent
+    - glassfish-jaxb-txw-parent
+    - jackson-annotations-javadoc
+    - jackson-bom
+    - jackson-core-javadoc
+    - jackson-databind-javadoc
+    - jackson-jaxrs-providers-datatypes
+    - jackson-jaxrs-providers-javadoc
+    - jackson-jaxrs-providers-parent
+    - jackson-module-jaxb-annotations-javadoc
+    - jackson-parent
+    - jakarta-commons-httpclient-demo
+    - jakarta-commons-httpclient-javadoc
+    - jakarta-commons-httpclient-manual
+    - jcl-over-slf4j
+    - jul-to-slf4j
+    - log4j-over-slf4j
+    - msv-demo
+    - msv-javadoc
+    - msv-manual
+    - msv-msv
+    - msv-rngconv
+    - msv-xmlgen
+    - msv-xsdlib
+    - relaxngDatatype-javadoc
+    - relaxngcc
+    - relaxngcc-javadoc
+    - resteasy-javadoc
+    - slf4j-ext
+    - slf4j-javadoc
+    - slf4j-jcl
+    - slf4j-log4j12
+    - slf4j-manual
+    - slf4j-sources
+    - stax-ex-javadoc
+    - velocity-demo
+    - velocity-javadoc
+    - velocity-manual
+    - xalan-j2-demo
+    - xalan-j2-javadoc
+    - xalan-j2-manual
+    - xalan-j2-xsltc
+    - xerces-j2-demo
+    - xerces-j2-javadoc
+    - xml-commons-apis-javadoc
+    - xml-commons-apis-manual
+    - xml-commons-resolver-javadoc
+    - xml-stylebook
+    - xml-stylebook-demo
+    - xml-stylebook-javadoc
+    - xmlstreambuffer-javadoc
+    - xsom-javadoc
+  buildopts:
+    rpms:
+      macros: |
+        %_with_xmvn_javadoc 1
+        %_without_asciidoc 1
+        %_without_avalon 1
+        %_without_bouncycastle 1
+        %_without_cython 1
+        %_without_dafsa 1
+        %_without_desktop 1
+        %_without_doxygen 1
+        %_without_dtd 1
+        %_without_eclipse 1
+        %_without_ehcache 1
+        %_without_emacs 1
+        %_without_equinox 1
+        %_without_fop 1
+        %_without_ftp 1
+        %_without_gradle 1
+        %_without_groovy 1
+        %_without_hadoop 1
+        %_without_hsqldb 1
+        %_without_itext 1
+        %_without_jackson 1
+        %_without_jmh 1
+        %_without_jna 1
+        %_without_jpa 1
+        %_without_junit5 1
+        %_without_logback 1
+        %_without_markdown 1
+        %_without_memcached 1
+        %_without_memoryfilesystem 1
+        %_without_obr 1
+        %_without_python 1
+        %_without_reporting 1
+        %_without_scm 1
+        %_without_snappy 1
+        %_without_spring 1
+        %_without_ssh 1
+        %_without_testlib 1
+  components:
+    rpms:
+      apache-commons-collections:
+        rationale: Apache Commons Collections packages
+        ref: stream-javapackages-tools-201801-rhel-8.2.0
+      apache-commons-lang:
+        rationale: Apache Commons Lang packages
+        ref: stream-javapackages-tools-201801-rhel-8.2.0
+      bea-stax:
+        rationale: BEA StAX packages
+        ref: stream-javapackages-tools-201801-rhel-8.2.0
+      fasterxml-oss-parent:
+        rationale: FasterXML parent pom BuildRequired by jackson-parent.
+        ref: stream-rhel-8.1.0-rhel-8.2.0
+      glassfish-fastinfoset:
+        rationale: Fast XML Information Set package Requires xmlstreambuffer, xsom.
+        ref: stream-pki-10.6-rhel-8.2.0
+        buildorder: 4
+      glassfish-jax-rs-api:
+        rationale: GlassFish JAX-RS API packages
+        ref: stream-pki-10.6-rhel-8.2.0
+      glassfish-jaxb:
+        rationale: JAXB Reference Implementation BuildRequires istack-commons. Requires
+          glassfish-fastinfoset, glassfish-jaxb-api.
+        ref: stream-pki-10.6-rhel-8.2.0
+        buildorder: 5
+      glassfish-jaxb-api:
+        rationale: GlassFish JAXB API packages
+        ref: stream-javapackages-tools-201801-rhel-8.2.0
+      jackson-annotations:
+        rationale: Jackson Annotations packages
+        ref: stream-pki-10.6-rhel-8.2.0
+        buildorder: 13
+      jackson-bom:
+        rationale: Jackson Bill-of-Materials POM packages
+        ref: stream-pki-10.6-rhel-8.2.0
+        buildorder: 11
+      jackson-core:
+        rationale: Jackson Core packages
+        ref: stream-pki-10.6-rhel-8.2.0
+        buildorder: 12
+      jackson-databind:
+        rationale: Jackson Data-binding packages
+        ref: stream-pki-10.6-rhel-8.2.0
+        buildorder: 14
+      jackson-jaxrs-providers:
+        rationale: Jackson JAX-RS Providers packages
+        ref: stream-pki-10.6-rhel-8.2.0
+        buildorder: 16
+      jackson-module-jaxb-annotations:
+        rationale: Jackson JAXB Annotations packages
+        ref: stream-pki-10.6-rhel-8.2.0
+        buildorder: 15
+      jackson-parent:
+        rationale: Jackson Parent POM packages BuildRequires fasterxml-oss-parent.
+        ref: stream-pki-10.6-rhel-8.2.0
+        buildorder: 10
+      jakarta-commons-httpclient:
+        rationale: Jakarta Commons HTTPClient packages
+        ref: stream-javapackages-tools-201801-rhel-8.2.0
+      javassist:
+        rationale: Javassist packages
+        ref: stream-javapackages-tools-201801-rhel-8.2.0
+      msv:
+        rationale: Multi-Schema Validator Requires relaxngDatatype.
+        ref: stream-javapackages-tools-201801-rhel-8.2.0
+        buildorder: 1
+      pki-servlet-engine:
+        rationale: PKI Servlet Engine packages
+        ref: stream-pki-10.7-rhel-8.2.0
+      python-nss:
+        rationale: Python binding for NSS Provides python-nss for pki-base-java.
+        ref: stream-pki-10.6-rhel-8.2.0
+      relaxngDatatype:
+        rationale: RELAX NG packages
+        ref: stream-javapackages-tools-201801-rhel-8.2.0
+      relaxngcc:
+        rationale: RELAX NG Compiler Compiler Requires msv.
+        ref: stream-rhel-8.0.0-rhel-8.2.0
+        buildorder: 2
+      resteasy:
+        rationale: RESTEasy packages
+        ref: stream-pki-10.6-rhel-8.2.0
+        buildorder: 17
+      slf4j:
+        rationale: Simple Logging Facade for Java Provides slf4j and slf4j-jdk14 for
+          pki-base-java.
+        ref: stream-maven-3.5-rhel-8.2.0
+      stax-ex:
+        rationale: StAX API extensions Requires bea-stax.
+        ref: stream-pki-10.6-rhel-8.2.0
+        buildorder: 2
+      velocity:
+        rationale: Velocity packages
+        ref: stream-javapackages-tools-201801-rhel-8.2.0
+      xalan-j2:
+        rationale: Xalan packages Provides xalan-j2 for pki-base-java.
+        ref: stream-javapackages-tools-201801-rhel-8.2.0
+        buildorder: 1
+      xerces-j2:
+        rationale: Xerces packages
+        ref: stream-javapackages-tools-201801-rhel-8.2.0
+      xml-commons-apis:
+        rationale: XML Commons APIs packages
+        ref: stream-javapackages-tools-201801-rhel-8.2.0
+      xml-commons-resolver:
+        rationale: XML Commons Resolver packages
+        ref: stream-javapackages-tools-201801-rhel-8.2.0
+      xml-stylebook:
+        rationale: XML Stylebook packages
+        ref: stream-javapackages-tools-201801-rhel-8.2.0
+      xmlstreambuffer:
+        rationale: XML Stream Buffer package Requires stax-ex.
+        ref: stream-pki-10.6-rhel-8.2.0
+        buildorder: 3
+      xsom:
+        rationale: XML Schema Object Model (XSOM) Requires relaxngcc.
+        ref: stream-rhel-8.0.0-rhel-8.2.0
+        buildorder: 3
+...