diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 866cad4..70a7b82 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -6,7 +6,7 @@ data:
   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.
+    A module to contain dependencies for PKI version 10.6 or later.    
   license:
     module:
     - MIT
@@ -27,7 +27,6 @@ data:
     - apache-commons-net-javadoc
     - bea-stax
     - bea-stax-javadoc
-    - fasterxml-oss-parent
     - glassfish-fastinfoset-javadoc
     - glassfish-jax-rs-api
     - glassfish-jax-rs-api-javadoc
@@ -44,14 +43,12 @@ data:
     - 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
@@ -68,7 +65,6 @@ data:
     - relaxngDatatype-javadoc
     - relaxngcc
     - relaxngcc-javadoc
-    - resteasy-javadoc
     - slf4j-ext
     - slf4j-javadoc
     - slf4j-jcl
@@ -132,127 +128,120 @@ data:
         %_without_snappy 1
         %_without_spring 1
         %_without_ssh 1
-        %_without_testlib 1
+        %_without_testlib 1        
   components:
     rpms:
       apache-commons-collections:
         rationale: Apache Commons Collections packages
-        ref: stream-javapackages-tools-201801-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
       apache-commons-lang:
         rationale: Apache Commons Lang packages
-        ref: stream-javapackages-tools-201801-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
       apache-commons-net:
         rationale: Apache Commons Net packages
-        ref: stream-javapackages-tools-201801-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
       bea-stax:
         rationale: BEA StAX packages
-        ref: stream-javapackages-tools-201801-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
       fasterxml-oss-parent:
         rationale: FasterXML parent pom BuildRequired by jackson-parent.
-        ref: stream-rhel-8.1.0-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
       glassfish-fastinfoset:
         rationale: Fast XML Information Set package Requires xmlstreambuffer, xsom.
-        ref: stream-pki-10.6-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
         buildorder: 4
       glassfish-jax-rs-api:
         rationale: GlassFish JAX-RS API packages
-        ref: stream-pki-10.6-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
       glassfish-jaxb:
         rationale: JAXB Reference Implementation BuildRequires istack-commons. Requires
           glassfish-fastinfoset, glassfish-jaxb-api.
-        ref: stream-pki-10.6-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
         buildorder: 5
       glassfish-jaxb-api:
         rationale: GlassFish JAXB API packages
-        ref: stream-javapackages-tools-201801-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
       jackson-annotations:
         rationale: Jackson Annotations packages
-        ref: stream-pki-10.6-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
         buildorder: 13
       jackson-bom:
         rationale: Jackson Bill-of-Materials POM packages
-        ref: stream-pki-10.6-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
         buildorder: 11
       jackson-core:
         rationale: Jackson Core packages
-        ref: stream-pki-10.6-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
         buildorder: 12
       jackson-databind:
         rationale: Jackson Data-binding packages
-        ref: stream-pki-10.6-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
         buildorder: 14
       jackson-jaxrs-providers:
         rationale: Jackson JAX-RS Providers packages
-        ref: stream-pki-10.6-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
         buildorder: 16
-      jackson-module-jaxb-annotations:
-        rationale: Jackson JAXB Annotations packages
-        ref: stream-pki-10.6-rhel-8.7.0
+      jackson-modules-base:
+        rationale: Jackson Modules packages
+        ref: stream-pki-deps-10.6-rhel-8.10.0
         buildorder: 15
       jackson-parent:
         rationale: Jackson Parent POM packages BuildRequires fasterxml-oss-parent.
-        ref: stream-pki-10.6-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
         buildorder: 10
       jakarta-commons-httpclient:
         rationale: Jakarta Commons HTTPClient packages
-        ref: stream-javapackages-tools-201801-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
       javassist:
         rationale: Javassist packages
-        ref: stream-javapackages-tools-201801-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
       msv:
         rationale: Multi-Schema Validator Requires relaxngDatatype.
-        ref: stream-javapackages-tools-201801-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
         buildorder: 1
       pki-servlet-engine:
-        rationale: PKI Servlet Engine packages
-        ref: stream-pki-10.6-rhel-8.7.0
-      python-nss:
-        rationale: Python binding for NSS Provides python-nss for pki-base-java.
-        ref: stream-pki-10.6-rhel-8.7.0
+        rationale: Provides backward compatibility for Candlepin
+        ref: stream-pki-deps-10.6-rhel-8.10.0
       relaxngDatatype:
         rationale: RELAX NG packages
-        ref: stream-javapackages-tools-201801-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
       relaxngcc:
         rationale: RELAX NG Compiler Compiler Requires msv.
-        ref: stream-rhel-8.0.0-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
         buildorder: 2
-      resteasy:
-        rationale: RESTEasy packages
-        ref: stream-pki-10.6-rhel-8.7.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.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
       stax-ex:
         rationale: StAX API extensions Requires bea-stax.
-        ref: stream-pki-10.6-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
         buildorder: 2
       velocity:
         rationale: Velocity packages
-        ref: stream-javapackages-tools-201801-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
       xalan-j2:
         rationale: Xalan packages Provides xalan-j2 for pki-base-java.
-        ref: stream-javapackages-tools-201801-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
         buildorder: 1
       xerces-j2:
         rationale: Xerces packages
-        ref: stream-javapackages-tools-201801-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
       xml-commons-apis:
         rationale: XML Commons APIs packages
-        ref: stream-javapackages-tools-201801-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
       xml-commons-resolver:
         rationale: XML Commons Resolver packages
-        ref: stream-javapackages-tools-201801-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
       xml-stylebook:
         rationale: XML Stylebook packages
-        ref: stream-javapackages-tools-201801-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
       xmlstreambuffer:
         rationale: XML Stream Buffer package Requires stax-ex.
-        ref: stream-pki-10.6-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
         buildorder: 3
       xsom:
         rationale: XML Schema Object Model (XSOM) Requires relaxngcc.
-        ref: stream-rhel-8.0.0-rhel-8.7.0
+        ref: stream-pki-deps-10.6-rhel-8.10.0
         buildorder: 3
 ...