diff --git a/pom.xml b/pom.xml
index e2e11e973d..a247cc9e76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -789,6 +789,18 @@
                 <artifactId>wildfly-elytron-ssl</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wildfly.security</groupId>
+                <artifactId>wildfly-elytron-ssl-base</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wildfly.security</groupId>
+                <artifactId>wildfly-elytron-ssl-base</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.wildfly.security</groupId>
                 <artifactId>wildfly-elytron-ssh-util</artifactId>
@@ -1423,7 +1435,8 @@
         <module>sasl/otp</module>
         <module>sasl/plain</module>
         <module>sasl/scram</module>
-        <module>ssl</module>
+        <module>ssl/base</module>
+        <module>ssl/domain</module>
         <module>ssh/util</module>
         <module>tool</module>
         <module>util</module>
diff --git a/ssl/base/pom.xml b/ssl/base/pom.xml
index 00cac17df2..ef6c6f2267 100644
--- a/ssl/base/pom.xml
+++ b/ssl/base/pom.xml
@@ -30,10 +30,10 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>wildfly-elytron-ssl</artifactId>
+    <artifactId>wildfly-elytron-ssl-base</artifactId>
 
-    <name>WildFly Elytron - SSL</name>
-    <description>WildFly Security SSL</description>
+    <name>WildFly Elytron - SSL Base</name>
+    <description>WildFly Security - Base SSL </description>
 
     <build>
         <plugins>
@@ -104,26 +104,14 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.wildfly.security</groupId>
-            <artifactId>wildfly-elytron-auth-server</artifactId>
-        </dependency>    
         <dependency>
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-base</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wildfly.security</groupId>
-            <artifactId>wildfly-elytron-credential</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wildfly.security</groupId>
-            <artifactId>wildfly-elytron-auth</artifactId>
+            <artifactId>wildfly-elytron-provider-util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.wildfly.security</groupId>
-            <artifactId>wildfly-elytron-util</artifactId>
-        </dependency>        
         <dependency>
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-x500</artifactId>
diff --git a/ssl/domain/pom.xml b/ssl/domain/pom.xml
index 2962284be0..544903fd00 100644
--- a/ssl/domain/pom.xml
+++ b/ssl/domain/pom.xml
@@ -33,12 +33,12 @@
     <artifactId>wildfly-elytron-ssl</artifactId>
 
     <name>WildFly Elytron - SSL Security Domain</name>
-    <description>WildFly Security SSL Domain</description>
+    <description>WildFly Security SSL with Security Domain Components</description>
 
     <dependencies>
         <dependency>
             <groupId>org.wildfly.security</groupId>
-            <artifactId>wildfly-elytron-ssl-common</artifactId>
+            <artifactId>wildfly-elytron-ssl-base</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wildfly.security</groupId>