diff --git a/.files b/.files
index e3c8da6..8541fa8 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 0e52b32..eb5ab44 100644
--- a/.rev
+++ b/.rev
@@ -22287,4 +22287,11 @@
     <user>staging-bot</user>
     <comment>Automatic update</comment>
   </revision>
+  <revision rev="3185" vrev="3185">
+    <srcmd5>1620c0e2c30ffef29b53563d44fce419</srcmd5>
+    <version>unknown</version>
+    <time>1650500920</time>
+    <user>staging-bot</user>
+    <comment>Automatic update</comment>
+  </revision>
 </revisionlist>
diff --git a/.servicemark b/.servicemark
index 5a9620a..f5eded6 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1 +1 @@
-763f1e9dfd2ab1b3a35c5013513be1da
+e3b27e35070df01ea02f5b48a49418dc
diff --git a/MicroOS-dvd5-dvd-x86_64.kiwi b/MicroOS-dvd5-dvd-x86_64.kiwi
index 6416d14..ff409c1 100644
--- a/MicroOS-dvd5-dvd-x86_64.kiwi
+++ b/MicroOS-dvd5-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__MicroOS___20220419" schemaversion="4.1">
+<image name="OBS__MicroOS___20220420" 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">20220419</productvar>
+      <productvar name="VERSION">20220420</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20220419,openSUSE MicroOS</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20220420,openSUSE MicroOS</productinfo>
       <productinfo name="LINGUAS">en_US </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20220419/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20220420/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
diff --git a/MicroOS-dvd5-kubic-dvd-x86_64.kiwi b/MicroOS-dvd5-kubic-dvd-x86_64.kiwi
index 4136e2e..569b9b0 100644
--- a/MicroOS-dvd5-kubic-dvd-x86_64.kiwi
+++ b/MicroOS-dvd5-kubic-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__MicroOS___20220419" schemaversion="4.1">
+<image name="OBS__MicroOS___20220420" 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">20220419</productvar>
+      <productvar name="VERSION">20220420</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20220419,openSUSE MicroOS</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20220420,openSUSE MicroOS</productinfo>
       <productinfo name="LINGUAS">en_US </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20220419/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20220420/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
diff --git a/MicroOS.product b/MicroOS.product
index af324d2..1024cda 100644
--- a/MicroOS.product
+++ b/MicroOS.product
@@ -6,7 +6,7 @@
       <name>MicroOS</name>
       <releasepkgname>MicroOS-release</releasepkgname>
       <endoflife/>
-      <version>20220419</version>
+      <version>20220420</version>
       <!-- release is no longer optional -->
       <release>0</release>
       <productline>MicroOS</productline>
diff --git a/dvd.group b/dvd.group
index 8438c5f..57ef7ce 100644
--- a/dvd.group
+++ b/dvd.group
@@ -1212,6 +1212,7 @@
     <package name="kqtquickcharts" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_edutainment -->
     <package name="kquickcharts" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="krb5" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
+    <package name="krb5-client" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
     <package name="krename" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="kreversi" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="kreversi-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
@@ -3097,6 +3098,9 @@
     <package name="openSUSE-release-appliance-custom" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="openSUSE-release-dvd" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release-dvd -->
     <package name="openSUSE-xfce-icon-theme" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
+    <package name="openafs" supportstatus="unsupported"/> <!-- reason: dvd:openafs-client -->
+    <package name="openafs-client" supportstatus="unsupported"/> <!-- reason: dvd:openafs-client -->
+    <package name="openafs-kmp-default" supportstatus="unsupported"/> <!-- reason: dvd:openafs-client -->
     <package name="openal-soft-data" supportstatus="unsupported"/> <!-- reason: dvd:grub2 -->
     <package name="opencc-data" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="openconnect" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -5002,7 +5006,6 @@
   <packagelist relationship="recommends">
     <package name="MozillaFirefox-branding-upstream" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libpng12-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <!-- openafs-client uninstallable: nothing provides kernel-uname-r = 5.16.15-1-default needed by openafs-kmp-default-1.8.8.1_k5.16.15_1-1.9.i586-->
   </packagelist>
 </group>
 <group name="dvd.x86_64">
@@ -5063,7 +5066,6 @@
     <package name="joycond" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="joycond-autoload" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="krb5-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="krb5-client" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
     <package name="ldmtool" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="lib389" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
     <package name="libHX32-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
@@ -5275,7 +5277,6 @@
     <package name="nbdkit-vddk-plugin" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="nss-mdns-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="numactl" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
-    <!-- openafs-client uninstallable: nothing provides kernel-uname-r = 5.16.15-1-default needed by openafs-kmp-default-1.8.8.1_k5.16.15_1-1.9.x86_64-->
     <package name="ovmf" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
     <package name="pam-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="pam_apparmor-32bit" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
diff --git a/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi b/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi
index 7b065fa..5d4a73a 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___20220419" schemaversion="4.1">
+<image name="OBS__openSUSE-Addon-NonOss___20220420" 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">20220419</productvar>
+      <productvar name="VERSION">20220420</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20220419,openSUSE NonOSS Addon</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20220420,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/20220419/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20220419/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20220420/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20220420/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
diff --git a/openSUSE-Addon-NonOss.product b/openSUSE-Addon-NonOss.product
index ce89da2..b19f1d3 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>20220419</version>
+        <version>20220420</version>
         <release>0</release> 
         <summary>openSUSE NonOSS Addon</summary>
         <shortsummary>non oss addon</shortsummary>
diff --git a/openSUSE-cd-mini-i586.kiwi b/openSUSE-cd-mini-i586.kiwi
index 97a3bf2..56d11b0 100644
--- a/openSUSE-cd-mini-i586.kiwi
+++ b/openSUSE-cd-mini-i586.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20220419" schemaversion="4.1">
+<image name="OBS__openSUSE___20220420" 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">20220419</productvar>
+      <productvar name="VERSION">20220420</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220419,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220420,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/20220419/i586</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220420/i586</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
diff --git a/openSUSE-cd-mini-x86_64.kiwi b/openSUSE-cd-mini-x86_64.kiwi
index c534dc7..58275d7 100644
--- a/openSUSE-cd-mini-x86_64.kiwi
+++ b/openSUSE-cd-mini-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20220419" schemaversion="4.1">
+<image name="OBS__openSUSE___20220420" 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">20220419</productvar>
+      <productvar name="VERSION">20220420</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220419,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220420,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/20220419/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220420/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index f40ce9b..743ebb1 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20220419" schemaversion="4.1">
+<image name="OBS__openSUSE___20220420" 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">20220419</productvar>
+      <productvar name="VERSION">20220420</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220419,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220420,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/20220419/i586</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220420/i586</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
@@ -1215,6 +1215,7 @@
       <repopackage name="kqtquickcharts"/>
       <repopackage name="kquickcharts"/>
       <repopackage name="krb5"/>
+      <repopackage name="krb5-client"/>
       <repopackage name="krename"/>
       <repopackage name="kreversi"/>
       <repopackage name="kreversi-lang"/>
@@ -3133,6 +3134,9 @@
       <repopackage name="open-iscsi"/>
       <repopackage name="open-vm-tools"/>
       <repopackage name="open-vm-tools-desktop"/>
+      <repopackage name="openafs"/>
+      <repopackage name="openafs-client"/>
+      <repopackage name="openafs-kmp-default"/>
       <repopackage name="openal-soft-data"/>
       <repopackage name="opencc-data"/>
       <repopackage name="openconnect"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index 6e08e8c..02b28b7 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20220419" schemaversion="4.1">
+<image name="OBS__openSUSE___20220420" 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">20220419</productvar>
+      <productvar name="VERSION">20220420</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220419,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220420,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/20220419/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220420/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
@@ -1268,7 +1268,7 @@
       <repopackage name="kquickcharts"/>
       <repopackage name="krb5"/>
       <repopackage name="krb5-32bit" arch="x86_64"/>
-      <repopackage name="krb5-client" arch="x86_64"/>
+      <repopackage name="krb5-client"/>
       <repopackage name="krename"/>
       <repopackage name="kreversi"/>
       <repopackage name="kreversi-lang"/>
@@ -3397,6 +3397,9 @@
       <repopackage name="open-iscsi"/>
       <repopackage name="open-vm-tools"/>
       <repopackage name="open-vm-tools-desktop"/>
+      <repopackage name="openafs"/>
+      <repopackage name="openafs-client"/>
+      <repopackage name="openafs-kmp-default"/>
       <repopackage name="openal-soft-data"/>
       <repopackage name="opencc-data"/>
       <repopackage name="openconnect"/>
diff --git a/openSUSE-ftp-ftp-i586_x86_64.kiwi b/openSUSE-ftp-ftp-i586_x86_64.kiwi
index 921a385..ac99051 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___20220419" schemaversion="4.1">
+<image name="OBS__openSUSE___20220420" 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-20220419-i586-x86_64</productvar>
+      <productvar name="MEDIUM_NAME">openSUSE-20220420-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">20220419</productvar>
+      <productvar name="VERSION">20220420</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220419,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220420,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/20220419/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220419/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220420/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220420/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="DEBUGMEDIUM">2</productoption>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
diff --git a/openSUSE.product b/openSUSE.product
index caea246..c15631a 100644
--- a/openSUSE.product
+++ b/openSUSE.product
@@ -4,7 +4,7 @@
     <product>
       <vendor>openSUSE</vendor>
       <name>openSUSE</name>
-      <version>20220419</version>
+      <version>20220420</version>
       <release>0</release>
 
       <productline>openSUSE</productline>
diff --git a/unsorted.yml b/unsorted.yml
index b8fbf90..d1ae78d 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -3285,6 +3285,7 @@ unsorted:
   - eekboard-devel 
   - eeyek-fonts 
   - efibootmgr: [i586] 
+  - efitools 
   - efivar 
   - efivar-devel 
   - efl 
@@ -7523,14 +7524,6 @@ unsorted:
   - java-15-openjdk-javadoc 
   - java-15-openjdk-jmods 
   - java-15-openjdk-src 
-  - java-16-openjdk 
-  - java-16-openjdk-accessibility 
-  - java-16-openjdk-demo 
-  - java-16-openjdk-devel 
-  - java-16-openjdk-headless 
-  - java-16-openjdk-javadoc 
-  - java-16-openjdk-jmods 
-  - java-16-openjdk-src 
   - java-17-openjdk 
   - java-17-openjdk-accessibility 
   - java-17-openjdk-demo 
@@ -8106,6 +8099,7 @@ unsorted:
   - kdoctools-devel 
   - kdsoap-devel 
   - kdstatemachineeditor-devel 
+  - kdumpid 
   - kea 
   - kea-devel 
   - kea-hooks 
@@ -8400,7 +8394,6 @@ unsorted:
   - kraft 
   - krb5-auth-dialog 
   - krb5-auth-dialog-lang 
-  - krb5-client: [i586] 
   - krb5-devel 
   - krb5-devel-32bit: [x86_64] 
   - krb5-mini 
@@ -9300,17 +9293,21 @@ unsorted:
   - libQt6Core6 
   - libQt6DBus6 
   - libQt6DataVisualization6 
+  - libQt6DataVisualizationQml6 
+  - libQt6DeclarativeOpcua6 
   - libQt6Designer6 
   - libQt6DesignerComponents6 
   - libQt6Gui6 
   - libQt6Help6 
   - libQt6HunspellInputMethod6 
+  - libQt6JsonRpc6 
   - libQt6LabsAnimation6 
   - libQt6LabsFolderListModel6 
   - libQt6LabsQmlModels6 
   - libQt6LabsSettings6 
   - libQt6LabsSharedImage6 
   - libQt6LabsWavefrontMesh6 
+  - libQt6LanguageServer6 
   - libQt6Mqtt6 
   - libQt6Multimedia6 
   - libQt6MultimediaQuick6 
@@ -9321,9 +9318,9 @@ unsorted:
   - libQt6OpcUa6 
   - libQt6OpenGL6 
   - libQt6OpenGLWidgets6 
-  - libQt6Pdf6 
-  - libQt6PdfQuick6 
-  - libQt6PdfWidgets6 
+  - libQt6Pdf6: [x86_64] 
+  - libQt6PdfQuick6: [x86_64] 
+  - libQt6PdfWidgets6: [x86_64] 
   - libQt6Positioning6 
   - libQt6PositioningQuick6 
   - libQt6PrintSupport6 
@@ -9377,9 +9374,9 @@ unsorted:
   - libQt6WaylandEglClientHwIntegration6 
   - libQt6WaylandEglCompositorHwIntegration6 
   - libQt6WebChannel6 
-  - libQt6WebEngineCore6 
-  - libQt6WebEngineQuick6 
-  - libQt6WebEngineWidgets6 
+  - libQt6WebEngineCore6: [x86_64] 
+  - libQt6WebEngineQuick6: [x86_64] 
+  - libQt6WebEngineWidgets6: [x86_64] 
   - libQt6WebSockets6 
   - libQt6Widgets6 
   - libQt6WlShellIntegration6 
@@ -9749,8 +9746,8 @@ unsorted:
   - libarm_compute26: [x86_64] 
   - libarm_compute_core26: [x86_64] 
   - libarm_compute_graph26: [x86_64] 
-  - libarmadillo10 
-  - libarmadillo10-32bit: [x86_64] 
+  - libarmadillo11 
+  - libarmadillo11-32bit: [x86_64] 
   - libarmnn28: [x86_64] 
   - libarmnn28-opencl: [x86_64] 
   - libarmnnBasePipeServer28: [x86_64] 
@@ -13487,7 +13484,7 @@ unsorted:
   - libradcli5 
   - librados-devel: [x86_64] # devel package of dvd:librados2 
   - libradospp-devel: [x86_64] # devel package of dvd:librados2 
-  - libraft0 
+  - libraft2 
   - libraptor-devel 
   - libraptor2-0-32bit: [x86_64] 
   - libraqm-devel 
@@ -14639,6 +14636,10 @@ unsorted:
   - libvotca2022 
   - libvotequorum8 
   - libvotequorum8-32bit: [x86_64] 
+  - libvpd-2_2-3 
+  - libvpd-2_2-3-32bit: [x86_64] 
+  - libvpd-devel 
+  - libvpd-devel-32bit: [x86_64] 
   - libvpd2 
   - libvpd2-32bit: [x86_64] 
   - libvpd2-devel 
@@ -16165,7 +16166,6 @@ unsorted:
   - mcds 
   - mcelog: [i586] 
   - mchange-commons 
-  - mchange-commons-javadoc 
   - mcjoin 
   - mcpp 
   - mcpp-devel 
@@ -16487,7 +16487,7 @@ unsorted:
   - mojo-executor-javadoc 
   - mojo-parent 
   - moka-icon-theme 
-  - mold 
+  - mold: [x86_64] 
   - molequeue 
   - molequeue-devel 
   - molequeue-doc 
@@ -18203,14 +18203,11 @@ unsorted:
   - openSUSE-release-usb-x11 
   - openSUSE-signkey-cert: [x86_64] 
   - openSUSEway 
-  - openafs 
   - openafs-authlibs 
   - openafs-authlibs-devel 
-  - openafs-client 
   - openafs-devel 
   - openafs-fuse_client 
   - openafs-kernel-source 
-  - openafs-kmp-default 
   - openafs-server 
   - openal-soft-devel 
   - openal-soft-devel-32bit: [x86_64] 
@@ -21342,6 +21339,7 @@ unsorted:
   - python-Genshi-doc 
   - python-Kivy-doc 
   - python-M2Crypto-doc 
+  - python-PyQRCode-doc 
   - python-SQLAlchemy-doc 
   - python-Scrapy-doc 
   - python-SpeechRecognition-common-en-US 
@@ -22973,6 +22971,7 @@ unsorted:
   - python310-elementpath 
   - python310-eliot 
   - python310-email-reply-parser 
+  - python310-email-validator 
   - python310-email_validator 
   - python310-emcee 
   - python310-emoji 
@@ -22987,6 +22986,7 @@ unsorted:
   - python310-envisage 
   - python310-enzyme 
   - python310-ephem 
+  - python310-ephemeral-port-reserve 
   - python310-epubmerge 
   - python310-eradicate 
   - python310-espeak 
@@ -26113,6 +26113,7 @@ unsorted:
   - python38-elementpath 
   - python38-eliot 
   - python38-email-reply-parser 
+  - python38-email-validator 
   - python38-email_validator 
   - python38-emcee 
   - python38-emoji 
@@ -26127,6 +26128,7 @@ unsorted:
   - python38-envisage 
   - python38-enzyme 
   - python38-ephem 
+  - python38-ephemeral-port-reserve 
   - python38-epubmerge 
   - python38-eradicate 
   - python38-espeak 
@@ -29160,6 +29162,7 @@ unsorted:
   - python39-elementpath 
   - python39-eliot 
   - python39-email-reply-parser 
+  - python39-email-validator 
   - python39-email_validator 
   - python39-emcee 
   - python39-emoji 
@@ -29174,6 +29177,7 @@ unsorted:
   - python39-envisage 
   - python39-enzyme 
   - python39-ephem 
+  - python39-ephemeral-port-reserve 
   - python39-epubmerge 
   - python39-eradicate 
   - python39-espeak 
@@ -31468,6 +31472,8 @@ unsorted:
   - qt6-datavisualization-devel 
   - qt6-datavisualization-imports 
   - qt6-datavisualization-private-devel 
+  - qt6-datavisualizationqml-devel 
+  - qt6-datavisualizationqml-private-devel 
   - qt6-dbus-devel 
   - qt6-dbus-private-devel 
   - qt6-declarative-devel 
@@ -31477,6 +31483,7 @@ unsorted:
   - qt6-declarative-imports 
   - qt6-declarative-private-devel 
   - qt6-declarative-tools 
+  - qt6-declarativeopcua-private-devel 
   - qt6-designer-devel 
   - qt6-designer-private-devel 
   - qt6-designercomponents-private-devel 
@@ -31490,6 +31497,7 @@ unsorted:
   - qt6-imageformats-devel 
   - qt6-imageformats-docs-html 
   - qt6-imageformats-docs-qch 
+  - qt6-jsonrpc-private-devel 
   - qt6-kmssupport-devel-static 
   - qt6-kmssupport-private-devel 
   - qt6-labsanimation-devel 
@@ -31504,6 +31512,7 @@ unsorted:
   - qt6-labssharedimage-private-devel 
   - qt6-labswavefrontmesh-devel 
   - qt6-labswavefrontmesh-private-devel 
+  - qt6-languageserver-private-devel 
   - qt6-linguist-devel 
   - qt6-lottie-docs-html 
   - qt6-lottie-docs-qch 
@@ -31531,6 +31540,7 @@ unsorted:
   - qt6-networkauth-docs-qch 
   - qt6-networkauth-examples 
   - qt6-networkauth-private-devel 
+  - qt6-networkinformation-glib 
   - qt6-networkinformation-nm 
   - qt6-opcua 
   - qt6-opcua-devel 
@@ -31543,13 +31553,13 @@ unsorted:
   - qt6-opengl-private-devel 
   - qt6-openglwidgets-devel 
   - qt6-packetprotocol-devel-static 
-  - qt6-pdf-devel 
-  - qt6-pdf-imports 
-  - qt6-pdf-private-devel 
-  - qt6-pdfquick-devel 
-  - qt6-pdfquick-private-devel 
-  - qt6-pdfwidgets-devel 
-  - qt6-pdfwidgets-private-devel 
+  - qt6-pdf-devel: [x86_64] 
+  - qt6-pdf-imports: [x86_64] 
+  - qt6-pdf-private-devel: [x86_64] 
+  - qt6-pdfquick-devel: [x86_64] 
+  - qt6-pdfquick-private-devel: [x86_64] 
+  - qt6-pdfwidgets-devel: [x86_64] 
+  - qt6-pdfwidgets-private-devel: [x86_64] 
   - qt6-platformsupport-devel-static 
   - qt6-platformsupport-private-devel 
   - qt6-platformtheme-gtk3 
@@ -31572,8 +31582,8 @@ unsorted:
   - qt6-qmlcore-devel 
   - qt6-qmlcore-private-devel 
   - qt6-qmldebug-devel-static 
-  - qt6-qmldevtools-devel-static 
   - qt6-qmldom-devel-static 
+  - qt6-qmllint-devel-static 
   - qt6-qmllocalstorage-devel 
   - qt6-qmllocalstorage-private-devel 
   - qt6-qmlmodels-devel 
@@ -31733,23 +31743,24 @@ unsorted:
   - qt6-waylandcompositor-private-devel 
   - qt6-waylandeglclienthwintegration-private-devel 
   - qt6-waylandeglcompositorhwintegration-private-devel 
+  - qt6-waylandglobal-private-devel 
   - qt6-webchannel-devel 
   - qt6-webchannel-docs-html 
   - qt6-webchannel-docs-qch 
   - qt6-webchannel-examples 
   - qt6-webchannel-imports 
   - qt6-webchannel-private-devel 
-  - qt6-webengine 
-  - qt6-webengine-docs-html 
-  - qt6-webengine-docs-qch 
-  - qt6-webengine-examples 
-  - qt6-webengine-imports 
-  - qt6-webenginecore-devel 
-  - qt6-webenginecore-private-devel 
-  - qt6-webenginequick-devel 
-  - qt6-webenginequick-private-devel 
-  - qt6-webenginewidgets-devel 
-  - qt6-webenginewidgets-private-devel 
+  - qt6-webengine: [x86_64] 
+  - qt6-webengine-docs-html: [x86_64] 
+  - qt6-webengine-docs-qch: [x86_64] 
+  - qt6-webengine-examples: [x86_64] 
+  - qt6-webengine-imports: [x86_64] 
+  - qt6-webenginecore-devel: [x86_64] 
+  - qt6-webenginecore-private-devel: [x86_64] 
+  - qt6-webenginequick-devel: [x86_64] 
+  - qt6-webenginequick-private-devel: [x86_64] 
+  - qt6-webenginewidgets-devel: [x86_64] 
+  - qt6-webenginewidgets-private-devel: [x86_64] 
   - qt6-websockets-devel 
   - qt6-websockets-docs-html 
   - qt6-websockets-docs-qch 
@@ -42087,7 +42098,6 @@ unsorted:
   - typelib-1_0-libdazzle-1_0 
   - typelib-1_0-libmirage-3_2 
   - typesafe-config 
-  - typesafe-config-javadoc 
   - typescript 
   - tzdb 
   - u-boot-tools