diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml
index 00c40151e4..7680701382 100644
--- a/core-java-modules/pom.xml
+++ b/core-java-modules/pom.xml
@@ -16,19 +16,19 @@
     </parent>
 
     <modules>
-        <!--Won't be upgraded to JDK 17 -->
+        <!--Won't be upgraded to JDK 17 reason specified in JAVA-18131-->
         <!--<module>core-java-8</module> -->
         <!--<module>core-java-8-2</module> -->
         <!--<module>core-java-8-datetime</module> -->
         <!--<module>core-java-8-datetime-2</module> -->
-        <module>core-java-collections-conversions-2</module>
-        <module>core-java-collections-conversions-3</module>
-        <module>core-java-concurrency-advanced-5</module>
         <!--<module>core-java-lang</module> -->
         <!--<module>core-java-lang-math-3</module> -->
         <!--<module>core-java-security</module> -->
         <!--<module>core-java-streams-2</module> -->
         <!--<module>core-java-sun</module> -->
+        <module>core-java-collections-conversions-2</module>
+        <module>core-java-collections-conversions-3</module>
+        <module>core-java-concurrency-advanced-5</module>
         <!-- <module>core-java-modules/core-java-9-new-features</module> --> <!-- JAVA-26056 -->
         <!-- <module>core-java-modules/core-java-14</module> --> <!-- JAVA-26056 -->
         <!-- <module>core-java-modules/core-java-16</module> --> <!-- JAVA-26056 -->
diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml
index e282e8dee2..620775a6b4 100644
--- a/persistence-modules/pom.xml
+++ b/persistence-modules/pom.xml
@@ -114,7 +114,7 @@
         <module>spring-jpa-3</module>
         <module>spring-jdbc</module>
 	    <module>spring-jdbc-2</module>
-        <!--<module>spring-jooq</module>-->
+        <!--<module>spring-jooq</module>--><!--disabling the jooq modules, as the default build profile is failing due to bad mv files. Please refer: JAVA-31341-->
         <module>spring-mybatis</module>
         <module>spring-persistence-simple</module>
         <module>spring-data-yugabytedb</module>
diff --git a/pom.xml b/pom.xml
index a30c9ef69a..4a8f18d02e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -809,7 +809,7 @@
                 <module>spring-exceptions</module>
                 <!--<module>spring-integration</module>--><!-- failing after upgrading to jdk17-->
                 <module>spring-jersey</module>
-                <!--<module>spring-jinq</module>-->
+                <!--<module>spring-jinq</module>--><!--disabling the jinq modules, as the default build profile is failing due to bad mv files. Please refer: JAVA-31341-->
                 <module>spring-kafka-2</module>
                 <module>spring-kafka-3</module>
                 <module>spring-kafka-4</module>