diff --git a/DVD5-i586.group b/DVD5-i586.group
index 2e373e42..cf05c159 100644
--- a/DVD5-i586.group
+++ b/DVD5-i586.group
@@ -570,7 +570,6 @@
     <package name="findutils"/>
     <package name="findutils-lang"/>
     <package name="fipscheck"/>
-    <package name="firewall-macros"/>
     <package name="firewalld"/>
     <package name="firewalld-lang"/>
     <package name="flac"/>
@@ -1110,6 +1109,7 @@
     <package name="jakarta-taglibs-standard"/>
     <package name="java-11-openjdk"/>
     <package name="java-11-openjdk-headless"/>
+    <package name="javapackages-filesystem"/>
     <package name="javapackages-tools"/>
     <package name="jfsutils"/>
     <package name="jhbuild"/>
@@ -1682,6 +1682,7 @@
     <package name="libQt5Location5"/>
     <package name="libQt5Multimedia5"/>
     <package name="libQt5Network5"/>
+    <package name="libQt5NetworkAuth5"/>
     <package name="libQt5Nfc5"/>
     <package name="libQt5Nfc5-imports"/>
     <package name="libQt5OpenGL5"/>
@@ -1945,6 +1946,7 @@
     <package name="libcroco-0_6-3"/>
     <package name="libcryptmount0"/>
     <package name="libcryptsetup12"/>
+    <package name="libcryptsetup12-hmac"/>
     <package name="libcryptui-data"/>
     <package name="libcryptui-lang"/>
     <package name="libcryptui0"/>
@@ -2298,7 +2300,7 @@
     <package name="libipmiconsole2"/>
     <package name="libipmidetect0"/>
     <package name="libipmimonitoring6"/>
-    <package name="libipset11"/>
+    <package name="libipset13"/>
     <package name="libiptc0"/>
     <package name="libiptcdata"/>
     <package name="libiptcdata-lang"/>
@@ -2661,7 +2663,7 @@
     <package name="libpython2_7-1_0"/>
     <package name="libpython3_6m1_0"/>
     <package name="libpyzy-1_0-0"/>
-    <package name="libqalculate19"/>
+    <package name="libqalculate20"/>
     <package name="libqb0"/>
     <package name="libqca-qt5"/>
     <package name="libqca-qt5-plugins"/>
diff --git a/DVD5-x86_64.group b/DVD5-x86_64.group
index 446b7456..43478735 100644
--- a/DVD5-x86_64.group
+++ b/DVD5-x86_64.group
@@ -115,7 +115,6 @@
     <package name="alsa-plugins-pulse"/>
     <package name="alsa-plugins-pulse-32bit"/>
     <package name="alsa-utils"/>
-    <package name="amanda"/>
     <package name="amarok"/>
     <package name="amavisd-new"/>
     <package name="amavisd-new-docs"/>
@@ -459,7 +458,6 @@
     <package name="drbd-utils"/>
     <package name="drkonqi5"/>
     <package name="drkonqi5-lang"/>
-    <package name="dump"/>
     <package name="dump-rmt"/>
     <package name="duplicity"/>
     <package name="duplicity-lang"/>
@@ -580,7 +578,6 @@
     <package name="findutils"/>
     <package name="findutils-lang"/>
     <package name="fipscheck"/>
-    <package name="firewall-macros"/>
     <package name="firewalld"/>
     <package name="firewalld-lang"/>
     <package name="flac"/>
@@ -1134,6 +1131,7 @@
     <package name="jakarta-taglibs-standard"/>
     <package name="java-11-openjdk"/>
     <package name="java-11-openjdk-headless"/>
+    <package name="javapackages-filesystem"/>
     <package name="javapackages-tools"/>
     <package name="jfsutils"/>
     <package name="jhbuild"/>
@@ -1708,6 +1706,7 @@
     <package name="libQt5Location5"/>
     <package name="libQt5Multimedia5"/>
     <package name="libQt5Network5"/>
+    <package name="libQt5NetworkAuth5"/>
     <package name="libQt5Nfc5"/>
     <package name="libQt5Nfc5-imports"/>
     <package name="libQt5OpenGL5"/>
@@ -2006,6 +2005,7 @@
     <package name="libcryptmount0-32bit"/>
     <package name="libcryptsetup12"/>
     <package name="libcryptsetup12-32bit"/>
+    <package name="libcryptsetup12-hmac"/>
     <package name="libcryptui-data"/>
     <package name="libcryptui-lang"/>
     <package name="libcryptui0"/>
@@ -2393,7 +2393,7 @@
     <package name="libipmiconsole2"/>
     <package name="libipmidetect0"/>
     <package name="libipmimonitoring6"/>
-    <package name="libipset11"/>
+    <package name="libipset13"/>
     <package name="libiptc0"/>
     <package name="libiptcdata"/>
     <package name="libiptcdata-lang"/>
@@ -2790,7 +2790,7 @@
     <package name="libpython3_6m1_0"/>
     <package name="libpython3_6m1_0-32bit"/>
     <package name="libpyzy-1_0-0"/>
-    <package name="libqalculate19"/>
+    <package name="libqalculate20"/>
     <package name="libqb0"/>
     <package name="libqca-qt5"/>
     <package name="libqca-qt5-plugins"/>
@@ -3881,6 +3881,8 @@
     <package name="perl-Mail-SpamAssassin"/>
     <package name="perl-MailTools"/>
     <package name="perl-Math-Base-Convert"/>
+    <package name="perl-Math-BigInt"/>
+    <package name="perl-Math-BigInt-GMP"/>
     <package name="perl-Module-Build"/>
     <package name="perl-Module-Implementation"/>
     <package name="perl-Module-Info"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
index 04584026..684ee129 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
@@ -570,7 +570,6 @@
       <repopackage name="findutils" arch="i586,i686"/>
       <repopackage name="findutils-lang" arch="i586,i686"/>
       <repopackage name="fipscheck" arch="i586,i686"/>
-      <repopackage name="firewall-macros" arch="i586,i686"/>
       <repopackage name="firewalld" arch="i586,i686"/>
       <repopackage name="firewalld-lang" arch="i586,i686"/>
       <repopackage name="flac" arch="i586,i686"/>
@@ -1116,6 +1115,7 @@
       <repopackage name="jakarta-taglibs-standard" arch="i586,i686"/>
       <repopackage name="java-11-openjdk" arch="i586,i686"/>
       <repopackage name="java-11-openjdk-headless" arch="i586,i686"/>
+      <repopackage name="javapackages-filesystem" arch="i586,i686"/>
       <repopackage name="javapackages-tools" arch="i586,i686"/>
       <repopackage name="jfsutils" arch="i586,i686"/>
       <repopackage name="jhbuild" arch="i586,i686"/>
@@ -1672,6 +1672,7 @@
       <repopackage name="libcroco-0_6-3" arch="i586,i686"/>
       <repopackage name="libcryptmount0" arch="i586,i686"/>
       <repopackage name="libcryptsetup12" arch="i586,i686"/>
+      <repopackage name="libcryptsetup12-hmac" arch="i586,i686"/>
       <repopackage name="libcryptui-data" arch="i586,i686"/>
       <repopackage name="libcryptui-lang" arch="i586,i686"/>
       <repopackage name="libcryptui0" arch="i586,i686"/>
@@ -2038,7 +2039,7 @@
       <repopackage name="libipmiconsole2" arch="i586,i686"/>
       <repopackage name="libipmidetect0" arch="i586,i686"/>
       <repopackage name="libipmimonitoring6" arch="i586,i686"/>
-      <repopackage name="libipset11" arch="i586,i686"/>
+      <repopackage name="libipset13" arch="i586,i686"/>
       <repopackage name="libiptc0" arch="i586,i686"/>
       <repopackage name="libiptcdata" arch="i586,i686"/>
       <repopackage name="libiptcdata-lang" arch="i586,i686"/>
@@ -2572,7 +2573,7 @@
       <repopackage name="libpython2_7-1_0" arch="i586,i686"/>
       <repopackage name="libpython3_6m1_0" arch="i586,i686"/>
       <repopackage name="libpyzy-1_0-0" arch="i586,i686"/>
-      <repopackage name="libqalculate19" arch="i586,i686"/>
+      <repopackage name="libqalculate20" arch="i586,i686"/>
       <repopackage name="libqb0" arch="i586,i686"/>
       <repopackage name="libqca-qt5" arch="i586,i686"/>
       <repopackage name="libqca-qt5-plugins" arch="i586,i686"/>
@@ -2612,6 +2613,7 @@
       <repopackage name="libQt5Location5" arch="i586,i686"/>
       <repopackage name="libQt5Multimedia5" arch="i586,i686"/>
       <repopackage name="libQt5Network5" arch="i586,i686"/>
+      <repopackage name="libQt5NetworkAuth5" arch="i586,i686"/>
       <repopackage name="libQt5Nfc5" arch="i586,i686"/>
       <repopackage name="libQt5Nfc5-imports" arch="i586,i686"/>
       <repopackage name="libQt5OpenGL5" 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 c012397f..e452c4e7 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
@@ -115,7 +115,6 @@
       <repopackage name="alsa-plugins-pulse" arch="x86_64"/>
       <repopackage name="alsa-plugins-pulse-32bit" arch="x86_64"/>
       <repopackage name="alsa-utils" arch="x86_64"/>
-      <repopackage name="amanda" arch="x86_64"/>
       <repopackage name="amarok" arch="x86_64"/>
       <repopackage name="amavisd-new" arch="x86_64"/>
       <repopackage name="amavisd-new-docs" arch="x86_64"/>
@@ -461,7 +460,6 @@
       <repopackage name="drbd-utils" arch="x86_64"/>
       <repopackage name="drkonqi5" arch="x86_64"/>
       <repopackage name="drkonqi5-lang" arch="x86_64"/>
-      <repopackage name="dump" arch="x86_64"/>
       <repopackage name="dump-rmt" arch="x86_64"/>
       <repopackage name="duplicity" arch="x86_64"/>
       <repopackage name="duplicity-lang" arch="x86_64"/>
@@ -583,7 +581,6 @@
       <repopackage name="findutils" arch="x86_64"/>
       <repopackage name="findutils-lang" arch="x86_64"/>
       <repopackage name="fipscheck" arch="x86_64"/>
-      <repopackage name="firewall-macros" arch="x86_64"/>
       <repopackage name="firewalld" arch="x86_64"/>
       <repopackage name="firewalld-lang" arch="x86_64"/>
       <repopackage name="flac" arch="x86_64"/>
@@ -1141,6 +1138,7 @@
       <repopackage name="jakarta-taglibs-standard" arch="x86_64"/>
       <repopackage name="java-11-openjdk" arch="x86_64"/>
       <repopackage name="java-11-openjdk-headless" arch="x86_64"/>
+      <repopackage name="javapackages-filesystem" arch="x86_64"/>
       <repopackage name="javapackages-tools" arch="x86_64"/>
       <repopackage name="jfsutils" arch="x86_64"/>
       <repopackage name="jhbuild" arch="x86_64"/>
@@ -1714,6 +1712,7 @@
       <repopackage name="libcryptmount0-32bit" arch="x86_64"/>
       <repopackage name="libcryptsetup12" arch="x86_64"/>
       <repopackage name="libcryptsetup12-32bit" arch="x86_64"/>
+      <repopackage name="libcryptsetup12-hmac" arch="x86_64"/>
       <repopackage name="libcryptui-data" arch="x86_64"/>
       <repopackage name="libcryptui-lang" arch="x86_64"/>
       <repopackage name="libcryptui0" arch="x86_64"/>
@@ -2116,7 +2115,7 @@
       <repopackage name="libipmiconsole2" arch="x86_64"/>
       <repopackage name="libipmidetect0" arch="x86_64"/>
       <repopackage name="libipmimonitoring6" arch="x86_64"/>
-      <repopackage name="libipset11" arch="x86_64"/>
+      <repopackage name="libipset13" arch="x86_64"/>
       <repopackage name="libiptc0" arch="x86_64"/>
       <repopackage name="libiptcdata" arch="x86_64"/>
       <repopackage name="libiptcdata-lang" arch="x86_64"/>
@@ -2684,7 +2683,7 @@
       <repopackage name="libpython3_6m1_0" arch="x86_64"/>
       <repopackage name="libpython3_6m1_0-32bit" arch="x86_64"/>
       <repopackage name="libpyzy-1_0-0" arch="x86_64"/>
-      <repopackage name="libqalculate19" arch="x86_64"/>
+      <repopackage name="libqalculate20" arch="x86_64"/>
       <repopackage name="libqb0" arch="x86_64"/>
       <repopackage name="libqca-qt5" arch="x86_64"/>
       <repopackage name="libqca-qt5-plugins" arch="x86_64"/>
@@ -2729,6 +2728,7 @@
       <repopackage name="libQt5Location5" arch="x86_64"/>
       <repopackage name="libQt5Multimedia5" arch="x86_64"/>
       <repopackage name="libQt5Network5" arch="x86_64"/>
+      <repopackage name="libQt5NetworkAuth5" arch="x86_64"/>
       <repopackage name="libQt5Nfc5" arch="x86_64"/>
       <repopackage name="libQt5Nfc5-imports" arch="x86_64"/>
       <repopackage name="libQt5OpenGL5" arch="x86_64"/>
@@ -3937,6 +3937,8 @@
       <repopackage name="perl-Mail-SPF" arch="x86_64"/>
       <repopackage name="perl-MailTools" arch="x86_64"/>
       <repopackage name="perl-Math-Base-Convert" arch="x86_64"/>
+      <repopackage name="perl-Math-BigInt" arch="x86_64"/>
+      <repopackage name="perl-Math-BigInt-GMP" arch="x86_64"/>
       <repopackage name="perl-MIME-Lite" arch="x86_64"/>
       <repopackage name="perl-MIME-tools" arch="x86_64"/>
       <repopackage name="perl-MIME-Types" arch="x86_64"/>