diff --git a/dvd.group b/dvd.group
index d8ec9edf..86f43b2d 100644
--- a/dvd.group
+++ b/dvd.group
@@ -211,6 +211,7 @@
     <package name="bash-completion" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="bash-doc" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="bash-lang" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
+    <package name="bbswitch-kmp-default" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="bc" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="bcm20702a1-firmware" supportstatus="unsupported"/> <!-- reason: dvd:bcm20702a1-firmware -->
     <package name="bcm43xx-firmware" supportstatus="unsupported"/> <!-- reason: dvd:bcm43xx-firmware -->
@@ -266,7 +267,6 @@
     <package name="brltty-driver-speech-dispatcher" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="brltty-driver-xwindow" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="brltty-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="brotli" supportstatus="unsupported"/> <!-- reason: dvd:patterns-network-network_admin -->
     <package name="bsd-games" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="bsdtar" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-osc-devel_osc_build -->
     <package name="btrfsmaintenance" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
@@ -2340,7 +2340,7 @@
     <package name="libldap-data" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libldapcpp1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libldb2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="liblensfun2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="liblensfun1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="liblhasa0" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="liblightdm-gobject-1-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="liblilv-0-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -4229,6 +4229,7 @@
     <package name="rtkit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="rtl-sdr" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="rtl-sdr-udev" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="rtl8812au-kmp-default" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="rtl_433" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="ruby" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="ruby-common" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
diff --git a/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi b/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi
index 1c7790e6..5770fa21 100644
--- a/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi
+++ b/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE-Addon-NonOss___20200402" schemaversion="4.1">
+<image name="OBS__openSUSE-Addon-NonOss___20200404" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -36,11 +36,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20200402</productvar>
+      <productvar name="VERSION">20200404</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20200402,openSUSE NonOSS Addon</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20200404,openSUSE NonOSS Addon</productinfo>
       <productinfo name="LINGUAS">af ar be_BY bg br ca cy el et ga gl gu_IN he hi_IN hr ka km ko lt mk nn pa_IN rw sk sl sr_CS ss st tg th tr uk ve vi xh zu </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20200402/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20200402/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20200404/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20200404/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/openSUSE</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/openSUSE</productoption>
diff --git a/openSUSE-Addon-NonOss.product b/openSUSE-Addon-NonOss.product
index 0fd0f02f..65609598 100644
--- a/openSUSE-Addon-NonOss.product
+++ b/openSUSE-Addon-NonOss.product
@@ -4,7 +4,7 @@
  <product>
         <vendor>openSUSE</vendor>
         <name>openSUSE-Addon-NonOss</name>
-        <version>20200402</version>
+        <version>20200404</version>
         <release>0</release> 
         <summary>openSUSE NonOSS Addon</summary>
         <shortsummary>non oss addon</shortsummary>
diff --git a/openSUSE-MicroOS-dvd5-dvd-x86_64.kiwi b/openSUSE-MicroOS-dvd5-dvd-x86_64.kiwi
index ef0d7500..fc9aff2d 100644
--- a/openSUSE-MicroOS-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-MicroOS-dvd5-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE-MicroOS___20200402" schemaversion="4.1">
+<image name="OBS__openSUSE-MicroOS___20200404" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -35,11 +35,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20200402</productvar>
+      <productvar name="VERSION">20200404</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-microos:20200402,openSUSE MicroOS</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-microos:20200404,openSUSE MicroOS</productinfo>
       <productinfo name="LINGUAS">en_US </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-MicroOS/20200402/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-MicroOS/20200404/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/openSUSE</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/openSUSE</productoption>
diff --git a/openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi b/openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi
index 1c2e207c..10edb345 100644
--- a/openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi
+++ b/openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE-MicroOS___20200402" schemaversion="4.1">
+<image name="OBS__openSUSE-MicroOS___20200404" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -35,11 +35,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20200402</productvar>
+      <productvar name="VERSION">20200404</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-microos:20200402,openSUSE MicroOS</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-microos:20200404,openSUSE MicroOS</productinfo>
       <productinfo name="LINGUAS">en_US </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-MicroOS/20200402/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-MicroOS/20200404/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/openSUSE</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/openSUSE</productoption>
diff --git a/openSUSE-MicroOS.product b/openSUSE-MicroOS.product
index bb1a6d1e..c49d535e 100644
--- a/openSUSE-MicroOS.product
+++ b/openSUSE-MicroOS.product
@@ -6,7 +6,7 @@
       <name>openSUSE-MicroOS</name>
       <releasepkgname>openSUSE-MicroOS-release</releasepkgname>
       <endoflife/>
-      <version>20200402</version>
+      <version>20200404</version>
       <!-- release is no longer optional -->
       <release>0</release>
       <productline>openSUSE-MicroOS</productline>
diff --git a/openSUSE-cd-mini-i586.kiwi b/openSUSE-cd-mini-i586.kiwi
index 09bfbc72..4a618c82 100644
--- a/openSUSE-cd-mini-i586.kiwi
+++ b/openSUSE-cd-mini-i586.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20200402" schemaversion="4.1">
+<image name="OBS__openSUSE___20200404" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -32,11 +32,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20200402</productvar>
+      <productvar name="VERSION">20200404</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20200402,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20200404,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20200402/i586</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20200404/i586</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/openSUSE</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/openSUSE</productoption>
diff --git a/openSUSE-cd-mini-x86_64.kiwi b/openSUSE-cd-mini-x86_64.kiwi
index be9118ed..c67f0b13 100644
--- a/openSUSE-cd-mini-x86_64.kiwi
+++ b/openSUSE-cd-mini-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20200402" schemaversion="4.1">
+<image name="OBS__openSUSE___20200404" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -35,11 +35,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20200402</productvar>
+      <productvar name="VERSION">20200404</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20200402,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20200404,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20200402/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20200404/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/openSUSE</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/openSUSE</productoption>
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index 3024d24b..5e46ec30 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20200402" schemaversion="4.1">
+<image name="OBS__openSUSE___20200404" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -32,11 +32,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20200402</productvar>
+      <productvar name="VERSION">20200404</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20200402,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20200404,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20200402/i586</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20200404/i586</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/openSUSE</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/openSUSE</productoption>
@@ -212,6 +212,7 @@
       <repopackage name="bash-completion"/>
       <repopackage name="bash-doc"/>
       <repopackage name="bash-lang"/>
+      <repopackage name="bbswitch-kmp-default"/>
       <repopackage name="bc"/>
       <repopackage name="bcm20702a1-firmware"/>
       <repopackage name="bcm43xx-firmware"/>
@@ -267,7 +268,6 @@
       <repopackage name="brltty-driver-speech-dispatcher"/>
       <repopackage name="brltty-driver-xwindow"/>
       <repopackage name="brltty-lang"/>
-      <repopackage name="brotli"/>
       <repopackage name="bsd-games"/>
       <repopackage name="bsdtar"/>
       <repopackage name="btrfsmaintenance"/>
@@ -2236,7 +2236,7 @@
       <repopackage name="libldap-data"/>
       <repopackage name="libldapcpp1"/>
       <repopackage name="libldb2"/>
-      <repopackage name="liblensfun2"/>
+      <repopackage name="liblensfun1"/>
       <repopackage name="liblhasa0"/>
       <repopackage name="liblightdm-gobject-1-0"/>
       <repopackage name="liblilv-0-0"/>
@@ -4283,6 +4283,7 @@
       <repopackage name="rtkit"/>
       <repopackage name="rtl-sdr"/>
       <repopackage name="rtl-sdr-udev"/>
+      <repopackage name="rtl8812au-kmp-default"/>
       <repopackage name="rtl_433"/>
       <repopackage name="ruby"/>
       <repopackage name="ruby-common"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index 8a0d117c..0ee34416 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20200402" schemaversion="4.1">
+<image name="OBS__openSUSE___20200404" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -35,11 +35,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20200402</productvar>
+      <productvar name="VERSION">20200404</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20200402,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20200404,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20200402/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20200404/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/openSUSE</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/openSUSE</productoption>
@@ -220,6 +220,7 @@
       <repopackage name="bash-completion"/>
       <repopackage name="bash-doc"/>
       <repopackage name="bash-lang"/>
+      <repopackage name="bbswitch-kmp-default"/>
       <repopackage name="bc"/>
       <repopackage name="bcm20702a1-firmware"/>
       <repopackage name="bcm43xx-firmware"/>
@@ -275,7 +276,6 @@
       <repopackage name="brltty-driver-speech-dispatcher"/>
       <repopackage name="brltty-driver-xwindow"/>
       <repopackage name="brltty-lang"/>
-      <repopackage name="brotli"/>
       <repopackage name="bsd-games"/>
       <repopackage name="bsdtar"/>
       <repopackage name="btrfsmaintenance"/>
@@ -2335,7 +2335,7 @@
       <repopackage name="libldb2"/>
       <repopackage name="libldb2-32bit" arch="x86_64"/>
       <repopackage name="libldm-1_0-0" arch="x86_64"/>
-      <repopackage name="liblensfun2"/>
+      <repopackage name="liblensfun1"/>
       <repopackage name="liblhasa0"/>
       <repopackage name="liblightdm-gobject-1-0"/>
       <repopackage name="liblilv-0-0"/>
@@ -4507,6 +4507,7 @@
       <repopackage name="rtkit"/>
       <repopackage name="rtl-sdr"/>
       <repopackage name="rtl-sdr-udev"/>
+      <repopackage name="rtl8812au-kmp-default"/>
       <repopackage name="rtl_433"/>
       <repopackage name="ruby"/>
       <repopackage name="ruby-common"/>
diff --git a/openSUSE-ftp-ftp-i586_x86_64.kiwi b/openSUSE-ftp-ftp-i586_x86_64.kiwi
index 8a6d75ee..229b63ad 100644
--- a/openSUSE-ftp-ftp-i586_x86_64.kiwi
+++ b/openSUSE-ftp-ftp-i586_x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20200402" schemaversion="4.1">
+<image name="OBS__openSUSE___20200404" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -24,7 +24,7 @@
       <productvar name="DISTNAME">openSUSE</productvar>
       <productvar name="FLAVOR">ftp</productvar>
       <productvar name="MAKE_LISTINGS">true</productvar>
-      <productvar name="MEDIUM_NAME">openSUSE-20200402-i586-x86_64</productvar>
+      <productvar name="MEDIUM_NAME">openSUSE-20200404-i586-x86_64</productvar>
       <productvar name="MULTIPLE_MEDIA">true</productvar>
       <productvar name="PRODUCT_DIR">/</productvar>
       <productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar>
@@ -36,11 +36,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20200402</productvar>
+      <productvar name="VERSION">20200404</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20200402,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20200404,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20200402/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20200402/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20200404/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20200404/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="DEBUGMEDIUM">2</productoption>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/openSUSE</productoption>
diff --git a/openSUSE.product b/openSUSE.product
index dabc78d0..e144b798 100644
--- a/openSUSE.product
+++ b/openSUSE.product
@@ -4,7 +4,7 @@
     <product>
       <vendor>openSUSE</vendor>
       <name>openSUSE</name>
-      <version>20200402</version>
+      <version>20200404</version>
       <release>0</release>
 
       <productline>openSUSE</productline>
diff --git a/unsorted.yml b/unsorted.yml
index 2d08e056..b113162a 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -1055,7 +1055,6 @@ unsorted:
   - bb 
   - bbe 
   - bbswitch 
-  - bbswitch-kmp-default 
   - bbswitch-kmp-pae: [i586] 
   - bcache-tools: [i586] 
   - bcal: [x86_64] 
@@ -1285,6 +1284,7 @@ unsorted:
   - brltty-driver-espeak 
   - brltty-driver-libbraille 
   - brltty-utils 
+  - brotli 
   - browserpass-native 
   - brp-check-suse 
   - brp-extract-appdata 
@@ -7954,7 +7954,7 @@ unsorted:
   - libantlr3c3 
   - libantlr3c3-32bit: [x86_64] 
   - libantlr4-runtime-devel 
-  - libantlr4-runtime4_7_2 
+  - libantlr4-runtime4_8 
   - libao-devel 
   - libao-plugins4-32bit: [x86_64] 
   - libao4-32bit: [x86_64] 
@@ -8426,7 +8426,7 @@ unsorted:
   - libcelt-devel-32bit: [x86_64] 
   - libcelt0-2-32bit: [x86_64] 
   - libcelt051-0 
-  - libcephfs-devel: [x86_64] # devel package of dvd:librados2 
+  - libcephfs-devel: [x86_64] # devel package of dvd:librbd1 
   - libceres-devel 
   - libceres1 
   - libcerf-devel 
@@ -8436,7 +8436,7 @@ unsorted:
   - libcfg6-32bit: [x86_64] 
   - libcfile-devel 
   - libcfile1 
-  - libcgns3_4_1 
+  - libcgns4_1 
   - libchafa0 
   - libchamplain-devel 
   - libchardet-devel 
@@ -11323,9 +11323,9 @@ unsorted:
   - libqxp-tools 
   - libqxtglobalshortcut0 
   - libradcli4 
-  - librados-devel: [x86_64] # devel package of dvd:librados2 
-  - libradospp-devel: [x86_64] # devel package of dvd:librados2 
-  - libradosstriper-devel: [x86_64] # devel package of dvd:librados2 
+  - librados-devel: [x86_64] # devel package of dvd:librbd1 
+  - libradospp-devel: [x86_64] # devel package of dvd:librbd1 
+  - libradosstriper-devel: [x86_64] # devel package of dvd:librbd1 
   - libraft0 
   - libragel0 
   - libraptor-devel 
@@ -11347,7 +11347,7 @@ unsorted:
   - libraw1394-devel-32bit: [x86_64] 
   - libraw1394-tools 
   - libraylib2 
-  - librbd-devel: [x86_64] # devel package of dvd:librados2 
+  - librbd-devel: [x86_64] # devel package of dvd:librbd1 
   - librbio2 
   - librbl1 
   - librcc-devel 
@@ -11573,7 +11573,7 @@ unsorted:
   - librevenge-doc 
   - librevenge-generators-0_0-0 
   - librfxencode0 
-  - librgw-devel: [x86_64] # devel package of dvd:librados2 
+  - librgw-devel: [x86_64] # devel package of dvd:librbd1 
   - librhash0 
   - librime-devel 
   - librime1 
@@ -14835,8 +14835,6 @@ unsorted:
   - notejot 
   - notejot-lang 
   - notepadqq 
-  - notes-up 
-  - notes-up-lang 
   - notify-osd 
   - notify-sharp 
   - notify-sharp-devel 
@@ -17658,8 +17656,6 @@ unsorted:
   - polkit-devel 
   - polkit-doc 
   - polkit-whitelisting 
-  - pology 
-  - pology-lang 
   - pommed 
   - pongix 
   - poppler-data 
@@ -18956,16 +18952,13 @@ unsorted:
   - python2-distroinfo 
   - python2-distutils-extra 
   - python2-dj-database-url 
-  - python2-django-appconf 
   - python2-django-avatar 
   - python2-django-babel 
   - python2-django-braces 
   - python2-django-ckeditor 
   - python2-django-classy-tags 
-  - python2-django-compressor 
   - python2-django-contrib-comments 
   - python2-django-coverage-plugin 
-  - python2-django-crispy-forms 
   - python2-django-environ 
   - python2-django-jinja 
   - python2-django-js-asset 
@@ -18982,7 +18975,6 @@ unsorted:
   - python2-django-seed 
   - python2-django-sekizai 
   - python2-django-storages 
-  - python2-django-tagging 
   - python2-django-tastypie 
   - python2-django-threadedcomments 
   - python2-django-webpack-loader 
@@ -19000,7 +18992,6 @@ unsorted:
   - python2-dogpile.cache 
   - python2-dogslow 
   - python2-dominate 
-  - python2-dparse 
   - python2-dpkt 
   - python2-dragonmapper 
   - python2-drms 
@@ -19137,7 +19128,6 @@ unsorted:
   - python2-girder-client 
   - python2-git-pw 
   - python2-git-url-parse 
-  - python2-gitdb2 
   - python2-github3.py 
   - python2-gitlint 
   - python2-glean 
@@ -19624,7 +19614,6 @@ unsorted:
   - python2-plyvel 
   - python2-pmw 
   - python2-pname 
-  - python2-pocketsphinx-python 
   - python2-podcastparser 
   - python2-podman 
   - python2-polib 
@@ -20125,7 +20114,6 @@ unsorted:
   - python2-smartypants 
   - python2-smbprotocol 
   - python2-smmap 
-  - python2-smmap2 
   - python2-snakefood 
   - python2-snimpy 
   - python2-snowballstemmer 
@@ -20316,6 +20304,7 @@ unsorted:
   - python2-vega_datasets 
   - python2-verboselogs 
   - python2-versioneer 
+  - python2-versiontag 
   - python2-versiontools 
   - python2-vim-vint 
   - python2-vine 
@@ -21514,7 +21503,6 @@ unsorted:
   - python3-git-pw 
   - python3-git-url-parse 
   - python3-gitdb 
-  - python3-gitdb2 
   - python3-github3.py 
   - python3-gitlint 
   - python3-glanceclient 
@@ -22226,7 +22214,6 @@ unsorted:
   - python3-pmw 
   - python3-pname 
   - python3-pocketsphinx 
-  - python3-pocketsphinx-python 
   - python3-pocketsphinx5 
   - python3-podcastparser 
   - python3-podman 
@@ -22801,7 +22788,6 @@ unsorted:
   - python3-smbprotocol 
   - python3-smbus 
   - python3-smmap 
-  - python3-smmap2 
   - python3-sniffio 
   - python3-snimpy 
   - python3-snuggs 
@@ -23054,6 +23040,7 @@ unsorted:
   - python3-venusian-doc 
   - python3-verboselogs 
   - python3-versioneer 
+  - python3-versiontag 
   - python3-versiontools 
   - python3-veusz: [x86_64] 
   - python3-vim-vint 
@@ -23376,7 +23363,7 @@ unsorted:
   - radeontop 
   - radeontop-lang 
   - radiotray-ng 
-  - rados-objclass-devel: [x86_64] # devel package of dvd:librados2 
+  - rados-objclass-devel: [x86_64] # devel package of dvd:librbd1 
   - raft-devel 
   - rage 
   - ragel 
@@ -23634,7 +23621,6 @@ unsorted:
   - rtaudio-devel 
   - rtl-sdr-devel 
   - rtl8812au 
-  - rtl8812au-kmp-default 
   - rtl8812au-kmp-pae: [i586] 
   - rtl_433-devel 
   - rtmidi-devel 
@@ -25067,14 +25053,6 @@ unsorted:
   - spyder-memory-profiler 
   - spyder-notebook 
   - spyder-terminal 
-  - spyder3 
-  - spyder3-breakpoints 
-  - spyder3-dicom 
-  - spyder3-hdf5 
-  - spyder3-lang 
-  - spyder3-notebook 
-  - spyder3-profiler 
-  - spyder3-pylint 
   - sql-parser-devel 
   - sqlcipher 
   - sqlcipher-devel