diff --git a/DVD5-i586.group b/DVD5-i586.group
index 8a084b15..da898b60 100644
--- a/DVD5-i586.group
+++ b/DVD5-i586.group
@@ -3424,9 +3424,8 @@
     <package name="open-iscsi"/>
     <package name="open-vm-tools"/>
     <package name="open-vm-tools-desktop"/>
-    <package name="openSUSE-Tumbleweed-Kubic-release"/>
-    <package name="openSUSE-Tumbleweed-Kubic-release-dvd"/>
     <package name="openSUSE-build-key"/>
+    <package name="openSUSE-release"/>
     <package name="openSUSE-release-dvd"/>
     <package name="openSUSE-xfce-icon-theme"/>
     <package name="openafs"/>
diff --git a/DVD5-x86_64.group b/DVD5-x86_64.group
index dc849c6d..e3948888 100644
--- a/DVD5-x86_64.group
+++ b/DVD5-x86_64.group
@@ -1140,7 +1140,8 @@
     <package name="ispell-spanish"/>
     <package name="issue-generator"/>
     <package name="iw"/>
-    <package name="java-12-openjdk"/>
+    <package name="java-11-openjdk"/>
+    <package name="java-11-openjdk-headless"/>
     <package name="java-12-openjdk-headless"/>
     <package name="javapackages-filesystem"/>
     <package name="javapackages-tools"/>
@@ -3301,6 +3302,7 @@
     <package name="libzvbi0"/>
     <package name="libzypp"/>
     <package name="libzypp-plugin-appdata"/>
+    <package name="lifecycle-data-openSUSE"/>
     <package name="lightdm"/>
     <package name="lightdm-gtk-greeter"/>
     <package name="lightdm-gtk-greeter-branding-openSUSE"/>
@@ -3571,9 +3573,8 @@
     <package name="open-iscsi"/>
     <package name="open-vm-tools"/>
     <package name="open-vm-tools-desktop"/>
-    <package name="openSUSE-Tumbleweed-Kubic-release"/>
-    <package name="openSUSE-Tumbleweed-Kubic-release-dvd"/>
     <package name="openSUSE-build-key"/>
+    <package name="openSUSE-release"/>
     <package name="openSUSE-release-dvd"/>
     <package name="openSUSE-xfce-icon-theme"/>
     <package name="openafs"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
index c3494bcd..f6fea784 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
@@ -3491,9 +3491,8 @@
       <repopackage name="openssl" arch="i586,i686"/>
       <repopackage name="openssl-1_1" arch="i586,i686"/>
       <repopackage name="openSUSE-build-key" arch="i586,i686"/>
+      <repopackage name="openSUSE-release" arch="i586,i686"/>
       <repopackage name="openSUSE-release-dvd" arch="i586,i686"/>
-      <repopackage name="openSUSE-Tumbleweed-Kubic-release" arch="i586,i686"/>
-      <repopackage name="openSUSE-Tumbleweed-Kubic-release-dvd" arch="i586,i686"/>
       <repopackage name="openSUSE-xfce-icon-theme" arch="i586,i686"/>
       <repopackage name="openvpn" arch="i586,i686"/>
       <repopackage name="opie" arch="i586,i686"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
index 1b59a22f..4b8e9ff3 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
@@ -1145,7 +1145,8 @@
       <repopackage name="ispell-spanish" arch="x86_64"/>
       <repopackage name="issue-generator" arch="x86_64"/>
       <repopackage name="iw" arch="x86_64"/>
-      <repopackage name="java-12-openjdk" arch="x86_64"/>
+      <repopackage name="java-11-openjdk" arch="x86_64"/>
+      <repopackage name="java-11-openjdk-headless" arch="x86_64"/>
       <repopackage name="java-12-openjdk-headless" arch="x86_64"/>
       <repopackage name="javapackages-filesystem" arch="x86_64"/>
       <repopackage name="javapackages-tools" arch="x86_64"/>
@@ -3306,6 +3307,7 @@
       <repopackage name="libzvbi0" arch="x86_64"/>
       <repopackage name="libzypp" arch="x86_64"/>
       <repopackage name="libzypp-plugin-appdata" arch="x86_64"/>
+      <repopackage name="lifecycle-data-openSUSE" arch="x86_64"/>
       <repopackage name="lightdm" arch="x86_64"/>
       <repopackage name="lightdm-gtk-greeter" arch="x86_64"/>
       <repopackage name="lightdm-gtk-greeter-branding-openSUSE" arch="x86_64"/>
@@ -3636,9 +3638,8 @@
       <repopackage name="openssl" arch="x86_64"/>
       <repopackage name="openssl-1_1" arch="x86_64"/>
       <repopackage name="openSUSE-build-key" arch="x86_64"/>
+      <repopackage name="openSUSE-release" arch="x86_64"/>
       <repopackage name="openSUSE-release-dvd" arch="x86_64"/>
-      <repopackage name="openSUSE-Tumbleweed-Kubic-release" arch="x86_64"/>
-      <repopackage name="openSUSE-Tumbleweed-Kubic-release-dvd" arch="x86_64"/>
       <repopackage name="openSUSE-xfce-icon-theme" arch="x86_64"/>
       <repopackage name="openvpn" arch="x86_64"/>
       <repopackage name="opie" arch="x86_64"/>