diff --git a/build.xml b/build.xml
index b2e878f7a16e..d227582aa95f 100644
--- a/build.xml
+++ b/build.xml
@@ -285,7 +285,6 @@
         <string>--add-exports jdk.naming.dns/com.sun.jndi.dns=java.naming</string>
         <string>--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</string>
         <string>--add-exports jdk.unsupported/sun.misc=ALL-UNNAMED</string>
-        <string>--add-exports java.base/jdk.internal.util.jar=ALL-UNNAMED</string>
 
         <string>--add-opens java.base/jdk.internal.module=ALL-UNNAMED</string>
         <string>--add-opens java.base/jdk.internal.reflect=ALL-UNNAMED</string>
@@ -316,6 +315,7 @@
         <!-- below 2 were added to support jamm and fix BatchCommitLogTest -->
         <string>--add-opens java.base/java.util.concurrent=ALL-UNNAMED</string>
         <string>--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED</string>
+        <string>--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED</string>
     </resources>
     <pathconvert property="_jvm22_args_concat" refid="_jvm22_arg_items" pathsep=" "/>
     <condition property="java-jvmargs" value="${_jvm22_args_concat}">
diff --git a/conf/jvm22-clients.options b/conf/jvm22-clients.options
index a076b8051d7c..d3d0e1725ab8 100644
--- a/conf/jvm22-clients.options
+++ b/conf/jvm22-clients.options
@@ -23,7 +23,7 @@
 --add-opens java.base/jdk.internal.reflect=ALL-UNNAMED
 --add-opens java.base/jdk.internal.math=ALL-UNNAMED
 --add-opens java.base/jdk.internal.module=ALL-UNNAMED
---add-opens java.base/jdk.internal.util.jar=ALL-UNNAMED
 --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED
+--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
 
 # The newline in the end of file is intentional
diff --git a/conf/jvm22-server.options b/conf/jvm22-server.options
index c76ba9905481..518b559d27b7 100644
--- a/conf/jvm22-server.options
+++ b/conf/jvm22-server.options
@@ -8,23 +8,6 @@
 #  GC SETTINGS  #
 #################
 
-
-
-### CMS Settings
-#-XX:+UseConcMarkSweepGC
-#-XX:+CMSParallelRemarkEnabled
-#-XX:SurvivorRatio=8
-#-XX:MaxTenuringThreshold=1
-#-XX:CMSInitiatingOccupancyFraction=75
-#-XX:+UseCMSInitiatingOccupancyOnly
-#-XX:CMSWaitDuration=10000
-#-XX:+CMSParallelInitialMarkEnabled
-#-XX:+CMSEdenChunksRecordAlways
-## some JVMs will fill up their heap when accessed via JMX, see CASSANDRA-6541
-#-XX:+CMSClassUnloadingEnabled
-
-
-
 ### G1 Settings
 ## Use the Hotspot garbage-first collector.
 -XX:+UseG1GC
@@ -64,8 +47,6 @@
 --add-exports java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED
 --add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED
 --add-exports java.rmi/sun.rmi.server=ALL-UNNAMED
-# --add-exports java.sql/java.sql=ALL-UNNAMED --> not seen in
-# Below exist in the other script
 --add-exports jdk.naming.dns/com.sun.jndi.dns=java.naming
 --add-exports jdk.unsupported/sun.misc=ALL-UNNAMED
 --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
@@ -74,24 +55,26 @@
 --add-opens java.base/jdk.internal.ref=ALL-UNNAMED
 --add-opens java.base/jdk.internal.reflect=ALL-UNNAMED
 --add-opens java.base/jdk.internal.math=ALL-UNNAMED
-# --add-opens java.base/jdk.internal.module=ALL-UNNAMED
---add-opens java.base/jdk.internal.util.jar=ALL-UNNAMED
+--add-opens java.base/jdk.internal.module=ALL-UNNAMED
 --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED
-# Added in
 --add-opens java.base/java.lang.module=ALL-UNNAMED
 --add-opens jdk.management.jfr/jdk.management.jfr=ALL-UNNAMED
 --add-opens jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED
 --add-opens jdk.compiler/com.sun.tools.javac=ALL-UNNAMED
---add-opens java.base/sun.nio.ch=ALL-UNNAMED
 --add-opens java.base/java.nio.file.spi=ALL-UNNAMED
 --add-opens java.base/java.nio=ALL-UNNAMED
 --add-opens java.base/java.net=ALL-UNNAMED
-
 --add-opens java.base/java.lang=ALL-UNNAMED
 --add-opens java.base/java.lang.reflect=ALL-UNNAMED
 --add-opens java.base/java.io=ALL-UNNAMED
 --add-opens java.base/java.util=ALL-UNNAMED
+--add-opens java.base/jdk.internal.vm=ALL-UNNAMED
+--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED
 
+# required for org.apache.cassandra.Util.getSupportedMTimeGranularity
+--add-opens java.base/java.nio.file.attribute=ALL-UNNAMED
+
+--add-opens jdk.compiler/com.sun.tools.javac=ALL-UNNAMED
 
 ### GC logging options -- uncomment to enable
 
@@ -123,7 +106,7 @@
 --add-modules jdk.incubator.vector
 
 ### Compatibility Options
---add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED
+--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED
 -Djava.security.manager=allow
 
 # The newline in the end of file is intentional