diff --git a/core-feature-pack/common/pom.xml b/core-feature-pack/common/pom.xml
index 246b2c4dff8..33811d2fee4 100644
--- a/core-feature-pack/common/pom.xml
+++ b/core-feature-pack/common/pom.xml
@@ -260,6 +260,16 @@
             <artifactId>wildfly-common</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.wildfly.core</groupId>
+            <artifactId>wildfly-elytron-integration-common</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.wildfly.core</groupId>
             <artifactId>wildfly-elytron-integration</artifactId>
diff --git a/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/extension/elytron-common/main/module.xml b/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/extension/elytron-common/main/module.xml
new file mode 100644
index 00000000000..9e23dd5c68d
--- /dev/null
+++ b/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/extension/elytron-common/main/module.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2023 Red Hat, Inc.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~   http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<module xmlns="urn:jboss:module:1.9" name="org.wildfly.extension.elytron-common">
+  <properties>
+    <property name="jboss.api" value="private"/>
+  </properties>
+
+  <resources>
+    <artifact name="${org.wildfly.core:wildfly-elytron-integration-common}"/>
+  </resources>
+
+  <dependencies>
+    <module name="java.logging"/>
+    <module name="java.naming"/>
+    <module name="java.xml"/>
+    <module name="jakarta.security.auth.message.api"/>
+    <module name="org.jboss.as.controller"/>
+    <module name="org.jboss.as.server"/>
+    <module name="org.jboss.logging"/>
+    <module name="org.jboss.modules"/>
+    <module name="org.jboss.msc"/>
+    <module name="org.wildfly.common"/>
+    <module name="org.wildfly.security.elytron-private"/>
+  </dependencies>
+</module>
\ No newline at end of file
diff --git a/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/extension/elytron/main/module.xml b/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/extension/elytron/main/module.xml
index 05c1f44b4e7..1d7aa7aaf16 100644
--- a/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/extension/elytron/main/module.xml
+++ b/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/extension/elytron/main/module.xml
@@ -31,7 +31,6 @@
         <exclude path="org/wildfly/extension/elytron/ElytronExtension"/>
         <exclude path="org/wildfly/extension/elytron/ElytronSubsystemTransformers"/>
         <exclude path="org/wildfly/extension/elytron/_private"/>
-        <exclude path="org/wildfly/extension/elytron/capabilities/_private"/>
         <exclude path="org/wildfly/extension/elytron/expression"/>
     </exports>
 
@@ -57,6 +56,7 @@
         <module name="org.jboss.vfs"/>
         <module name="org.jboss.logmanager"/>
         <module name="org.wildfly.common"/>
+        <module name="org.wildfly.extension.elytron-common" services="import"/>
         <module name="org.wildfly.security.elytron-private"/>
     </dependencies>
 </module>