diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml
index 9bfd17125c..2152b90bcb 100644
--- a/core-java-modules/pom.xml
+++ b/core-java-modules/pom.xml
@@ -193,6 +193,11 @@
         <module>core-java-collections-maps-6</module>
         <module>core-java-records</module>
         <module>core-java-9-jigsaw</module>
+        <!--<module>core-java-20</module>--> <!--JAVA-25373-->
+        <module>core-java-collections-set</module>
+        <module>core-java-date-operations-1</module>
+        <!--<module>core-java-datetime-conversion</module>--> <!--JAVA-25433-->
+        <module>core-java-httpclient</module>
     </modules>
 
     <dependencyManagement>
diff --git a/pom.xml b/pom.xml
index 517495d7b1..3f4da4bdb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -692,6 +692,7 @@
             </build>
 
             <modules>
+                <module>parent-boot-3</module>
                 <module>lombok-modules</module>
                 <module>osgi</module>
                 <module>spring-katharsis</module>
@@ -931,7 +932,8 @@
                 <module>language-interop</module>
                 <module>gradle-modules/gradle/maven-to-gradle</module>
                 <module>persistence-modules/spring-data-neo4j</module>
-                <module>parent-boot-3</module>
+                <module>gcp-firebase</module>
+                <module>spring-di-4</module>
                 <module>spring-kafka-2</module>
                 <!--<module>java-panama</module> Java-19 module-->
             </modules>
@@ -967,6 +969,7 @@
             </build>
 
             <modules>
+                <module>parent-boot-3</module>
                 <module>lombok-modules</module>
                 <module>osgi</module>
                 <module>spring-katharsis</module>
@@ -1040,6 +1043,14 @@
 
                 <module>core-java-modules</module>
                 <module>gcp-firebase</module>
+                <!-- <module>core-java-modules/core-java-9-new-features</module> --> <!-- uses preview features, to be decided how to handle -->
+                <!-- <module>core-java-modules/core-java-12</module> --> <!-- uses preview features, to be decided how to handle -->
+                <!-- <module>core-java-modules/core-java-13</module> --> <!-- uses preview features, to be decided how to handle -->
+                <!-- <module>core-java-modules/core-java-14</module> --> <!-- uses preview features, to be decided how to handle -->
+                <!-- <module>core-java-modules/core-java-15</module> --> <!-- uses preview features, to be decided how to handle -->
+                <!-- <module>core-java-modules/core-java-16</module> --> <!-- uses preview features, to be decided how to handle -->
+                <!-- <module>core-java-modules/core-java-17</module> --> <!-- uses preview features, to be decided how to handle -->
+                <!-- <module>core-java-modules/core-java-19</module> --> <!-- uses preview features, to be decided how to handle -->
                 <module>spring-aop</module>
                 <module>spring-aop-2</module>
                 <module>custom-pmd</module>
@@ -1208,6 +1219,8 @@
                 <module>gradle-modules/gradle/maven-to-gradle</module>
                 <module>persistence-modules/spring-data-neo4j</module>
                 <module>spring-actuator</module>
+                <module>gcp-firebase</module>
+                <module>spring-di-4</module>
                 <module>spring-kafka-2</module>
                 <!--<module>java-panama</module> Java-19 module-->
             </modules>
@@ -1225,7 +1238,6 @@
             <modules>
                 <module>parent-boot-1</module>
                 <module>parent-boot-2</module>
-                <module>parent-boot-3</module>
                 <module>parent-spring-4</module>
                 <module>parent-spring-5</module>
                 <module>parent-spring-6</module>