diff --git a/dvd.group b/dvd.group
index 28c03be5..59b85fc6 100644
--- a/dvd.group
+++ b/dvd.group
@@ -905,8 +905,9 @@
     <package name="issue-generator" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="iw" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="jack-dbus" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="java-11-openjdk" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
-    <package name="java-11-openjdk-headless" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
+    <package name="java-21-openjdk" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
+    <package name="java-21-openjdk-devel" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
+    <package name="java-21-openjdk-headless" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="javapackages-filesystem" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="javapackages-tools" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="jfsutils" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
@@ -3005,6 +3006,7 @@
     <package name="mozilla-nspr" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="mozilla-nss" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="mozilla-nss-certs" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
+    <package name="mozilla-nss-sysinit" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="mozilla-nss-tools" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
     <package name="mpg123-openal" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="mpt-firmware" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index b75aaa7c..a49c0b21 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -905,8 +905,9 @@
       <repopackage name="issue-generator"/>
       <repopackage name="iw"/>
       <repopackage name="jack-dbus"/>
-      <repopackage name="java-11-openjdk"/>
-      <repopackage name="java-11-openjdk-headless"/>
+      <repopackage name="java-21-openjdk"/>
+      <repopackage name="java-21-openjdk-devel"/>
+      <repopackage name="java-21-openjdk-headless"/>
       <repopackage name="javapackages-filesystem"/>
       <repopackage name="javapackages-tools"/>
       <repopackage name="jfsutils"/>
@@ -3019,6 +3020,7 @@
       <repopackage name="mozilla-nspr"/>
       <repopackage name="mozilla-nss"/>
       <repopackage name="mozilla-nss-certs"/>
+      <repopackage name="mozilla-nss-sysinit"/>
       <repopackage name="mozilla-nss-tools"/>
       <repopackage name="MozillaFirefox"/>
       <repopackage name="MozillaFirefox-branding-openSUSE"/>
diff --git a/unsorted.yml b/unsorted.yml
index 18279c0e..067a8115 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -8792,8 +8792,10 @@ unsorted:
   - java-11-openj9-javadoc 
   - java-11-openj9-jmods 
   - java-11-openj9-src 
+  - java-11-openjdk 
   - java-11-openjdk-demo 
   - java-11-openjdk-devel 
+  - java-11-openjdk-headless 
   - java-11-openjdk-javadoc 
   - java-11-openjdk-jmods 
   - java-11-openjdk-src 
@@ -8833,7 +8835,6 @@ unsorted:
   - java-21-openj9-jmods 
   - java-21-openj9-src 
   - java-21-openjdk-demo 
-  - java-21-openjdk-devel 
   - java-21-openjdk-javadoc 
   - java-21-openjdk-jmods 
   - java-21-openjdk-src