diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
index 80137d6c66f..3375ee9dfac 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
+++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
@@ -47,10 +47,8 @@ jre-base= \
  java.lang.management, \
  java.lang.ref, \
  java.lang.reflect, \
- java.lang.runtime, \
  java.math, \
  java.net, \
- java.net.http, \
  java.nio, \
  java.nio.channels, \
  java.nio.channels.spi, \
@@ -82,7 +80,6 @@ jre-base= \
  java.util.concurrent.atomic, \
  java.util.concurrent.locks, \
  java.util.function, \
- java.util.random, \
  java.util.jar, \
  java.util.logging, \
  java.util.prefs, \
@@ -493,21 +490,36 @@ jre-9= \
  com.sun.security.sasl, \
  com.sun.security.sasl.digest, \
  com.sun.security.sasl.ntlm, \
- com.sun.security.sasl.util 
+ com.sun.security.sasl.util
 
 jre-10 = ${jre-9}
-jre-11 = ${jre-9}
-jre-12 = ${jre-9}
-jre-13 = ${jre-9}
-jre-14 = ${jre-9}
-jre-15 = ${jre-9}
-jre-16 = ${jre-9}
-jre-17 = ${jre-9}
-jre-18 = ${jre-9}
-jre-19 = ${jre-9}
-jre-20 = ${jre-9}
-jre-21 = ${jre-9}
-jre-23 = ${jre-9}
-jre-24 = ${jre-9}
-jre-25 = ${jre-9}
-jre-26 = ${jre-9}
+jre-11 = ${jre-9}, \
+ java.net.http, \
+ jdk.nio
+jre-12 = ${jre-11}, \
+ java.lang.constant, \
+ javax.naming.ldap.spi
+jre-13 = ${jre-12}
+jre-14 = ${jre-12}, \
+ jdk.nio.mapmode
+jre-15 = ${jre-14}
+jre-16 = ${jre-14}, \
+ java.lang.runtime
+jre-17 = ${jre-16}, \
+ java.util.random
+jre-18 = ${jre-17}
+jre-19 = ${jre-17}
+jre-20 = ${jre-17}
+jre-21 = ${jre-17}
+jre-22 = ${jre-17}, \
+ java.lang.foreign
+jre-23 = ${jre-22}
+jre-24 = ${jre-22}, \
+ java.lang.classfile, \
+ java.lang.classfile.attribute, \
+ java.lang.classfile.constantpool, \
+ java.lang.classfile.instruction, \
+ jdk.management
+jre-25 = ${jre-24}, \
+ javax.sound
+jre-26 = ${jre-25}