diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml
index 4dad7e6a62f3..dafa79b0e181 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml
+++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml
@@ -81,7 +81,7 @@
         <module name="jakarta.servlet.api"/>
         <module name="javax.wsdl4j.api"/>
         <module name="jakarta.xml.bind.api" services="import"/>
-        <module name="com.sun.xml.bind" services="import"/>
+        <module name="org.glassfish.jaxb" services="import"/>
         <module name="jakarta.xml.soap.api"/>
         <module name="jakarta.xml.ws.api"/>
         <module name="org.apache.commons.lang3"/>
diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/main/module.xml
index 5d51742c54be..dc458562b9c7 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/main/module.xml
+++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/main/module.xml
@@ -51,7 +51,7 @@
         <module name="jakarta.resource.api" />
         <module name="javax.wsdl4j.api" />
         <module name="jakarta.xml.bind.api" services="import"/>
-        <module name="com.sun.xml.bind" services="import"/>
+        <module name="org.glassfish.jaxb" services="import"/>
         <module name="com.sun.xml.messaging.saaj" export="true" services="export"/>
         <module name="jakarta.xml.soap.api" />
         <module name="jakarta.xml.ws.api" />
diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/services-sts/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/services-sts/main/module.xml
index a00008709e05..d7953cc3f24d 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/services-sts/main/module.xml
+++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/services-sts/main/module.xml
@@ -59,7 +59,7 @@
         <module name="jakarta.servlet.api" />
         <module name="javax.wsdl4j.api" />
         <module name="jakarta.xml.bind.api" services="import"/>
-        <module name="com.sun.xml.bind" services="import"/>
+        <module name="org.glassfish.jaxb" services="import"/>
         <module name="jakarta.xml.soap.api" />
         <module name="jakarta.xml.ws.api" />
         <module name="org.apache.commons.lang3" />
diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/ws-security/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/ws-security/main/module.xml
index ed788e4e9841..a03c89e20ca7 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/ws-security/main/module.xml
+++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/ws-security/main/module.xml
@@ -30,7 +30,7 @@
 
     <dependencies>
         <module name="asm.asm" />
-        <module name="com.sun.xml.bind" services="import"/>
+        <module name="org.glassfish.jaxb" services="import"/>
         <module name="java.logging" />
         <module name="java.security.jgss" />
         <module name="java.xml" />
diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/santuario/xmlsec/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/santuario/xmlsec/main/module.xml
index c4c34f27de76..646e6586ae79 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/santuario/xmlsec/main/module.xml
+++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/santuario/xmlsec/main/module.xml
@@ -40,7 +40,7 @@
       <module name="org.apache.commons.codec"/>
       <module name="org.slf4j"/>
       <module name="jakarta.xml.bind.api" services="import"/>
-      <module name="com.sun.xml.bind" services="import"/>
+      <module name="org.glassfish.jaxb" services="import"/>
       <module name="java.xml"/>
       <module name="java.xml.crypto"/>
     </dependencies>
diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/ws/security/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/ws/security/main/module.xml
index 6aa83e791403..bfa8abaaabcc 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/ws/security/main/module.xml
+++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/ws/security/main/module.xml
@@ -37,7 +37,7 @@
       <module name="jdk.security.jgss"/>
       <module name="java.security.jgss"/>
       <module name="jakarta.xml.bind.api" services="import"/>
-      <module name="com.sun.xml.bind" services="import"/>
+      <module name="org.glassfish.jaxb" services="import"/>
       <module name="com.sun.xml.messaging.saaj" export="true" services="export"/>
       <module name="org.apache.commons.codec"/>
       <module name="org.apache.commons.logging"/>
diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/server/integration/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/server/integration/main/module.xml
index 56ee732c77ec..aa1312f99fbf 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/server/integration/main/module.xml
+++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/server/integration/main/module.xml
@@ -32,7 +32,7 @@
         <module name="asm.asm" export="true"/>
         <module name="javax.wsdl4j.api" export="true"/>
         <module name="jakarta.xml.ws.api" export="true"/>
-        <module name="com.sun.xml.bind" services="export" export="true"/>
+        <module name="org.glassfish.jaxb" services="export" export="true"/>
         <module name="org.jboss.ws.api" export="true"/>
         <module name="org.jboss.ws.spi" export="true"/>
         <module name="org.jboss.ws.common" services="import" export="true"/>
diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml
index dce38cc7e2dc..3020bc66b7f8 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml
+++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml
@@ -34,7 +34,7 @@
 
     <dependencies>
         <module name="jakarta.xml.bind.api"/>
-        <module name="com.sun.xml.bind" services="import"/>
+        <module name="org.glassfish.jaxb" services="import"/>
         <module name="org.apache.commons.logging"/>
         <module name="org.apache.commons.beanutils"/>
         <module name="java.xml"/>
diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-atom-provider/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-atom-provider/main/module.xml
index ffcd75908f67..fdc75bdc2823 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-atom-provider/main/module.xml
+++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-atom-provider/main/module.xml
@@ -29,7 +29,7 @@
     </resources>
 
     <dependencies>
-        <module name="com.sun.xml.bind"/>
+        <module name="org.glassfish.jaxb"/>
         <module name="jakarta.xml.bind.api"/>
         <module name="jakarta.enterprise.api"/>
         <module name="jakarta.servlet.api"/>
diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxb-provider/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxb-provider/main/module.xml
index ae6c3eccfd3a..399f96d73dcd 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxb-provider/main/module.xml
+++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxb-provider/main/module.xml
@@ -29,7 +29,7 @@
     </resources>
 
     <dependencies>
-        <module name="com.sun.xml.bind"/>
+        <module name="org.glassfish.jaxb"/>
         <module name="jakarta.xml.bind.api"/>
         <module name="jakarta.enterprise.api"/>
         <module name="jakarta.servlet.api"/>
diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml
index a90cb07c598b..7a520b0eb3c0 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml
+++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml
@@ -39,7 +39,7 @@
         <module name="jakarta.servlet.api" />
         <module name="jakarta.xml.bind.api" />
         <module name="jakarta.security.auth.message.api"/>
-        <module name="com.sun.xml.bind" services="import"/>
+        <module name="org.glassfish.jaxb" services="import"/>
         <module name="jakarta.xml.ws.api" />
         <module name="org.jboss.ws.api" />
         <module name="org.jboss.ws.spi" />