diff --git a/MicroOS-dvd5-dvd-x86_64.kiwi b/MicroOS-dvd5-dvd-x86_64.kiwi
index ca1083f2..d1dee267 100644
--- a/MicroOS-dvd5-dvd-x86_64.kiwi
+++ b/MicroOS-dvd5-dvd-x86_64.kiwi
@@ -651,8 +651,8 @@
       <repopackage name="iso_ent"/>
       <repopackage name="issue-generator"/>
       <repopackage name="jack-dbus"/>
-      <repopackage name="java-22-openjdk"/>
-      <repopackage name="java-22-openjdk-headless"/>
+      <repopackage name="java-21-openjdk"/>
+      <repopackage name="java-21-openjdk-headless"/>
       <repopackage name="javapackages-filesystem"/>
       <repopackage name="javapackages-tools"/>
       <repopackage name="jmdict"/>
diff --git a/opensuse_aeon.group b/opensuse_aeon.group
index ba893ecb..4109a1e9 100644
--- a/opensuse_aeon.group
+++ b/opensuse_aeon.group
@@ -477,8 +477,8 @@
     <package name="iso_ent" supportstatus="unsupported"/> <!-- reason: opensuse_aeon:patterns-aeon-base -->
     <package name="issue-generator" supportstatus="unsupported"/> <!-- reason: opensuse_aeon:patterns-aeon-base -->
     <package name="jack-dbus" supportstatus="unsupported"/> <!-- reason: opensuse_aeon:patterns-aeon-base -->
-    <package name="java-22-openjdk" supportstatus="unsupported"/> <!-- reason: opensuse_aeon:Aeon-release -->
-    <package name="java-22-openjdk-headless" supportstatus="unsupported"/> <!-- reason: opensuse_aeon:Aeon-release -->
+    <package name="java-21-openjdk" supportstatus="unsupported"/> <!-- reason: opensuse_aeon:Aeon-release -->
+    <package name="java-21-openjdk-headless" supportstatus="unsupported"/> <!-- reason: opensuse_aeon:Aeon-release -->
     <package name="javapackages-filesystem" supportstatus="unsupported"/> <!-- reason: opensuse_aeon:Aeon-release -->
     <package name="javapackages-tools" supportstatus="unsupported"/> <!-- reason: opensuse_aeon:Aeon-release -->
     <package name="jmdict" supportstatus="unsupported"/> <!-- reason: opensuse_aeon:Aeon-release -->
diff --git a/opensuse_kalpa.group b/opensuse_kalpa.group
index 71f9b32a..cf9b1c6d 100644
--- a/opensuse_kalpa.group
+++ b/opensuse_kalpa.group
@@ -411,8 +411,8 @@
     <package name="iso_ent" supportstatus="unsupported"/> <!-- reason: opensuse_kalpa:patterns-kalpa-base -->
     <package name="issue-generator" supportstatus="unsupported"/> <!-- reason: opensuse_kalpa:patterns-kalpa-base -->
     <package name="jack-dbus" supportstatus="unsupported"/> <!-- reason: opensuse_kalpa:patterns-kalpa-base -->
-    <package name="java-22-openjdk" supportstatus="unsupported"/> <!-- reason: opensuse_kalpa:Kalpa-release -->
-    <package name="java-22-openjdk-headless" supportstatus="unsupported"/> <!-- reason: opensuse_kalpa:Kalpa-release -->
+    <package name="java-21-openjdk" supportstatus="unsupported"/> <!-- reason: opensuse_kalpa:Kalpa-release -->
+    <package name="java-21-openjdk-headless" supportstatus="unsupported"/> <!-- reason: opensuse_kalpa:Kalpa-release -->
     <package name="javapackages-filesystem" supportstatus="unsupported"/> <!-- reason: opensuse_kalpa:Kalpa-release -->
     <package name="javapackages-tools" supportstatus="unsupported"/> <!-- reason: opensuse_kalpa:Kalpa-release -->
     <package name="jmdict" supportstatus="unsupported"/> <!-- reason: opensuse_kalpa:Kalpa-release -->
diff --git a/opensuse_microos.group b/opensuse_microos.group
index 44b88927..63f9d564 100644
--- a/opensuse_microos.group
+++ b/opensuse_microos.group
@@ -641,8 +641,8 @@
     <package name="iso_ent" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="issue-generator" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-base -->
     <package name="jack-dbus" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
-    <package name="java-22-openjdk" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
-    <package name="java-22-openjdk-headless" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
+    <package name="java-21-openjdk" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
+    <package name="java-21-openjdk-headless" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="javapackages-filesystem" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="javapackages-tools" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="jmdict" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
diff --git a/unsorted.yml b/unsorted.yml
index 92c80d49..39a2540d 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -8930,8 +8930,10 @@ unsorted:
   - java-21-openjdk-javadoc 
   - java-21-openjdk-jmods 
   - java-21-openjdk-src 
+  - java-22-openjdk 
   - java-22-openjdk-demo 
   - java-22-openjdk-devel 
+  - java-22-openjdk-headless 
   - java-22-openjdk-javadoc 
   - java-22-openjdk-jmods 
   - java-22-openjdk-src