diff --git a/environments/se/build/pom.xml b/environments/se/build/pom.xml
index 50d5f08c5b..45a468bce1 100644
--- a/environments/se/build/pom.xml
+++ b/environments/se/build/pom.xml
@@ -121,12 +121,14 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <configuration>
+                            <sourceFileExcludes>
+                                <!-- Skip module-info as multiple would be included -->
+                                <sourceFileExclude>**/module-info.java</sourceFileExclude>
+                            </sourceFileExcludes>
                             <includeDependencySources>true</includeDependencySources>
                             <dependencySourceIncludes>
                                 <dependencySourceInclude>org.jboss.weld:*</dependencySourceInclude>
                                 <dependencySourceInclude>org.jboss.weld.se:*</dependencySourceInclude>
-                                <dependencySourceInclude>jakarta.enterprise:*</dependencySourceInclude>
-                                <dependencySourceInclude>jakarta.inject:*</dependencySourceInclude>
                             </dependencySourceIncludes>
                             <additionalDependencies>
                                 <additionalDependency>
@@ -144,12 +146,6 @@
                                     <artifactId>bcel</artifactId>
                                     <version>${apache.bcel.version}</version>
                                 </additionalDependency>
-                                <!-- Temporary until there is release with https://github.com/eclipse-ee4j/cdi/pull/449 -->
-                                <additionalDependency>
-                                    <groupId>jakarta.ejb</groupId>
-                                    <artifactId>jakarta.ejb-api</artifactId>
-                                    <version>4.0.0-RC2</version>
-                                </additionalDependency>
                             </additionalDependencies>
                         </configuration>
                         <executions>
diff --git a/environments/servlet/build/pom.xml b/environments/servlet/build/pom.xml
index dbda03197e..78dffd21c5 100644
--- a/environments/servlet/build/pom.xml
+++ b/environments/servlet/build/pom.xml
@@ -138,13 +138,15 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <configuration>
+                            <sourceFileExcludes>
+                                <!-- Skip module-info as multiple would be included -->
+                                <sourceFileExclude>**/module-info.java</sourceFileExclude>
+                            </sourceFileExcludes>
                             <includeDependencySources>true</includeDependencySources>
                             <dependencySourceIncludes>
                                 <dependencySourceInclude>org.jboss.weld:*</dependencySourceInclude>
                                 <dependencySourceInclude>org.jboss.weld.module:*</dependencySourceInclude>
                                 <dependencySourceInclude>org.jboss.weld.servlet:*</dependencySourceInclude>
-                                <dependencySourceInclude>jakarta.enterprise:*</dependencySourceInclude>
-                                <dependencySourceInclude>jakarta.inject:*</dependencySourceInclude>
                             </dependencySourceIncludes>
                             <additionalDependencies>
                                 <additionalDependency>
@@ -173,7 +175,7 @@
                                     <version>${jsp.api.version}</version>
                                 </additionalDependency>
                                 <additionalDependency>
-                                    <groupId>org.jboss</groupId>
+                                    <groupId>io.smallrye</groupId>
                                     <artifactId>jandex</artifactId>
                                     <version>${jandex.version}</version>
                                 </additionalDependency>
@@ -193,8 +195,8 @@
                                     <version>${jetty.version}</version>
                                 </additionalDependency>
                                 <additionalDependency>
-                                    <groupId>org.eclipse.jetty</groupId>
-                                    <artifactId>jetty-servlet</artifactId>
+                                    <groupId>org.eclipse.jetty.ee10</groupId>
+                                    <artifactId>jetty-ee10-servlet</artifactId>
                                     <version>${jetty.version}</version>
                                 </additionalDependency>
                                 <additionalDependency>