diff --git a/MicroOS-dvd5-dvd-x86_64.kiwi b/MicroOS-dvd5-dvd-x86_64.kiwi
index 2bf455b9..77c2670a 100644
--- a/MicroOS-dvd5-dvd-x86_64.kiwi
+++ b/MicroOS-dvd5-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__MicroOS___20220429" schemaversion="4.1">
+<image name="OBS__MicroOS___20220430" 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">20220429</productvar>
+      <productvar name="VERSION">20220430</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20220429,openSUSE MicroOS</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20220430,openSUSE MicroOS</productinfo>
       <productinfo name="LINGUAS">en_US </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20220429/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20220430/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 e7af7740..b6d741fe 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___20220429" schemaversion="4.1">
+<image name="OBS__MicroOS___20220430" 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">20220429</productvar>
+      <productvar name="VERSION">20220430</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20220429,openSUSE MicroOS</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20220430,openSUSE MicroOS</productinfo>
       <productinfo name="LINGUAS">en_US </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20220429/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20220430/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 a3ec6ad2..fcc75f12 100644
--- a/MicroOS.product
+++ b/MicroOS.product
@@ -6,7 +6,7 @@
       <name>MicroOS</name>
       <releasepkgname>MicroOS-release</releasepkgname>
       <endoflife/>
-      <version>20220429</version>
+      <version>20220430</version>
       <!-- release is no longer optional -->
       <release>0</release>
       <productline>MicroOS</productline>
diff --git a/dvd.group b/dvd.group
index 1371494e..73131073 100644
--- a/dvd.group
+++ b/dvd.group
@@ -98,15 +98,15 @@
     <package name="akregator" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="akregator-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="alpine" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
-    <package name="alsa" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+    <package name="alsa" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
     <package name="alsa-firmware" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="alsa-oss" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="alsa-plugins" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+    <package name="alsa-oss" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
+    <package name="alsa-plugins" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
     <package name="alsa-plugins-pulse" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="alsa-plugins-speexrate" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="alsa-plugins-upmix" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="alsa-ucm-conf" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="alsa-utils" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+    <package name="alsa-plugins-speexrate" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
+    <package name="alsa-plugins-upmix" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
+    <package name="alsa-ucm-conf" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
+    <package name="alsa-utils" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
     <package name="alts" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="amavisd-milter" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="amavisd-new" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
@@ -327,8 +327,8 @@
     <package name="cups-pk-helper" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="cups-pk-helper-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="curl" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
-    <package name="cvs" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="cvsps" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="cvs" supportstatus="unsupported"/> <!-- reason: dvd:git -->
+    <package name="cvsps" supportstatus="unsupported"/> <!-- reason: dvd:git -->
     <package name="cyradm" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="cyreal-lobster-cyrillic-fonts" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="cyrus-imapd" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
@@ -362,8 +362,8 @@
     <package name="dhcp" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-dhcp_dns_server -->
     <package name="dhcp-relay" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-dhcp_dns_server -->
     <package name="dhcp-server" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-dhcp_dns_server -->
-    <package name="dialog" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="dialog-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+    <package name="dialog" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
+    <package name="dialog-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
     <package name="diffutils" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="diffutils-lang" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="ding" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
@@ -571,7 +571,7 @@
     <package name="girepository-1_0" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="git" supportstatus="unsupported"/> <!-- reason: dvd:git -->
     <package name="git-core" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
-    <package name="git-cvs" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="git-cvs" supportstatus="unsupported"/> <!-- reason: dvd:git -->
     <package name="git-email" supportstatus="unsupported"/> <!-- reason: dvd:git -->
     <package name="git-gui" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="git-svn" supportstatus="unsupported"/> <!-- reason: dvd:git -->
@@ -1609,7 +1609,7 @@
     <package name="libatkmm-1_6-1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libatm1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libatomic1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
-    <package name="libatopology2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+    <package name="libatopology2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
     <package name="libatspi0" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="libattr1" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="libaudit1" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
@@ -1777,7 +1777,7 @@
     <package name="libdevmapper-event1_03" supportstatus="unsupported"/> <!-- reason: dvd:grub2 -->
     <package name="libdevmapper1_03" supportstatus="unsupported"/> <!-- reason: dvd:grub2 -->
     <package name="libdhash1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="libdialog15" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+    <package name="libdialog15" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
     <package name="libdiscid0" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="libdjvulibre21" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="libdleyna-core-1_0-5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -3257,9 +3257,9 @@
     <package name="perl-Crypt-SmbHash" supportstatus="unsupported"/> <!-- reason: dvd:patterns-yast-yast2_server -->
     <package name="perl-Cyrus-IMAP" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="perl-Cyrus-SIEVE-managesieve" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
-    <package name="perl-DBD-SQLite" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="perl-DBD-SQLite" supportstatus="unsupported"/> <!-- reason: dvd:git -->
     <package name="perl-DBD-mysql" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
-    <package name="perl-DBI" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="perl-DBI" supportstatus="unsupported"/> <!-- reason: dvd:git -->
     <package name="perl-Data-Validate-IP" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="perl-Date-Manip" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="perl-Digest-HMAC" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
@@ -4186,6 +4186,7 @@
     <package name="ruby3.1-rubygem-simplecov-html" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="ruby3.1-rubygem-simplecov_json_formatter" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="ruby3.1-rubygem-simpleidn" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_yast -->
+    <package name="ruby3.1-rubygem-sinatra" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="ruby3.1-rubygem-slim" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="ruby3.1-rubygem-slop" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="ruby3.1-rubygem-spring" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
@@ -4352,7 +4353,7 @@
     <package name="speedcrunch" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="splix" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-printing -->
     <package name="spu-tools" supportstatus="unsupported"/> <!-- reason: dvd:spu-tools -->
-    <package name="sqlite3-devel" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="sqlite3-devel" supportstatus="unsupported"/> <!-- reason: dvd:git -->
     <package name="sqlite3-tcl" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="squashfs" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="squid" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
@@ -4443,8 +4444,8 @@
     <package name="tar-rmt" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_yast -->
     <package name="tcl" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="tcpdump" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="tcsh" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="tcsh-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="tcsh" supportstatus="unsupported"/> <!-- reason: dvd:git -->
+    <package name="tcsh-lang" supportstatus="unsupported"/> <!-- reason: dvd:git -->
     <package name="technisat-usb2-firmware" supportstatus="unsupported"/> <!-- reason: dvd:technisat-usb2-firmware -->
     <package name="telepathy-idle" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="telepathy-logger" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -4911,7 +4912,7 @@
     <package name="yast2-slp" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="yast2-slp-server" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="yast2-snapper" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="yast2-sound" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="yast2-sound" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-multimedia -->
     <package name="yast2-squid" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="yast2-storage-ng" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="yast2-sudo" supportstatus="unsupported"/> <!-- reason: dvd:patterns-yast-yast2_server -->
diff --git a/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi b/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi
index 4a3f4d5e..6d8d4e9e 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___20220429" schemaversion="4.1">
+<image name="OBS__openSUSE-Addon-NonOss___20220430" 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">20220429</productvar>
+      <productvar name="VERSION">20220430</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20220429,openSUSE NonOSS Addon</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20220430,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/20220429/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20220429/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20220430/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20220430/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 84b0a36f..07360ea6 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>20220429</version>
+        <version>20220430</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 477e6e5f..a3fe081c 100644
--- a/openSUSE-cd-mini-i586.kiwi
+++ b/openSUSE-cd-mini-i586.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20220429" schemaversion="4.1">
+<image name="OBS__openSUSE___20220430" 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">20220429</productvar>
+      <productvar name="VERSION">20220430</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220429,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220430,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/20220429/i586</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220430/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 5006a13b..ad3ca283 100644
--- a/openSUSE-cd-mini-x86_64.kiwi
+++ b/openSUSE-cd-mini-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20220429" schemaversion="4.1">
+<image name="OBS__openSUSE___20220430" 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">20220429</productvar>
+      <productvar name="VERSION">20220430</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220429,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220430,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/20220429/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220430/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 7e5649e9..37c95ad7 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20220429" schemaversion="4.1">
+<image name="OBS__openSUSE___20220430" 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">20220429</productvar>
+      <productvar name="VERSION">20220430</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220429,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220430,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/20220429/i586</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220430/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>
@@ -4245,6 +4245,7 @@
       <repopackage name="ruby3.1-rubygem-simplecov-html"/>
       <repopackage name="ruby3.1-rubygem-simplecov_json_formatter"/>
       <repopackage name="ruby3.1-rubygem-simpleidn"/>
+      <repopackage name="ruby3.1-rubygem-sinatra"/>
       <repopackage name="ruby3.1-rubygem-slim"/>
       <repopackage name="ruby3.1-rubygem-slop"/>
       <repopackage name="ruby3.1-rubygem-spring"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index e0bb67cc..6341c22c 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20220429" schemaversion="4.1">
+<image name="OBS__openSUSE___20220430" 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">20220429</productvar>
+      <productvar name="VERSION">20220430</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220429,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220430,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/20220429/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220430/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>
@@ -4535,6 +4535,7 @@
       <repopackage name="ruby3.1-rubygem-simplecov-html"/>
       <repopackage name="ruby3.1-rubygem-simplecov_json_formatter"/>
       <repopackage name="ruby3.1-rubygem-simpleidn"/>
+      <repopackage name="ruby3.1-rubygem-sinatra"/>
       <repopackage name="ruby3.1-rubygem-slim"/>
       <repopackage name="ruby3.1-rubygem-slop"/>
       <repopackage name="ruby3.1-rubygem-spring"/>
diff --git a/openSUSE-ftp-ftp-i586_x86_64.kiwi b/openSUSE-ftp-ftp-i586_x86_64.kiwi
index 8c6efe33..89a2db0d 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___20220429" schemaversion="4.1">
+<image name="OBS__openSUSE___20220430" 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-20220429-i586-x86_64</productvar>
+      <productvar name="MEDIUM_NAME">openSUSE-20220430-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">20220429</productvar>
+      <productvar name="VERSION">20220430</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220429,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220430,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/20220429/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220429/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220430/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220430/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 870b7573..00225999 100644
--- a/openSUSE.product
+++ b/openSUSE.product
@@ -4,7 +4,7 @@
     <product>
       <vendor>openSUSE</vendor>
       <name>openSUSE</name>
-      <version>20220429</version>
+      <version>20220430</version>
       <release>0</release>
 
       <productline>openSUSE</productline>
diff --git a/unsorted.yml b/unsorted.yml
index 95e9ca23..faddbbfe 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -6588,6 +6588,7 @@ unsorted:
   - gtk4-devel-tools 
   - gtk4-docs 
   - gtk4-metatheme-adapta 
+  - gtk4-metatheme-arc 
   - gtk4-metatheme-matcha 
   - gtk4-metatheme-plata 
   - gtk4-metatheme-yaru-mate 
@@ -9099,7 +9100,7 @@ unsorted:
   - libOpenImageIO2_3 
   - libOpenImageIO_Util2_3 
   - libOpenSceneGraph-devel 
-  - libOpenSceneGraph158 
+  - libOpenSceneGraph161 
   - libOpenThreads-devel 
   - libOpenThreads21 
   - libOyranosSynnefo-devel 
@@ -14894,7 +14895,6 @@ unsorted:
   - libwxlua_bind-wx31-3_1_0_0 
   - libwxlua_debug-wx31-3_1_0_0 
   - libwxlua_debugger-wx31-3_1_0_0 
-  - libwxstedit-wx30gtk2u-1_6_0 
   - libwxsvg-devel 
   - libwxsvg3 
   - libx86-1 
@@ -16250,7 +16250,6 @@ unsorted:
   - metallb-controller: [x86_64] 
   - metallb-speaker: [x86_64] 
   - metamath 
-  - metamath-book 
   - metatheme-adapta-common 
   - metatheme-ambiance-common 
   - metatheme-arc-common 
@@ -24321,6 +24320,7 @@ unsorted:
   - python310-python-jose 
   - python310-python-json-logger 
   - python310-python-jsonschema-objects 
+  - python310-python-keycloak 
   - python310-python-louvain 
   - python310-python-lsp-black 
   - python310-python-lsp-jsonrpc 
@@ -27364,6 +27364,7 @@ unsorted:
   - python38-python-jose 
   - python38-python-json-logger 
   - python38-python-jsonschema-objects 
+  - python38-python-keycloak 
   - python38-python-louvain 
   - python38-python-lsp-black 
   - python38-python-lsp-jsonrpc 
@@ -30533,6 +30534,7 @@ unsorted:
   - python39-python-jose 
   - python39-python-json-logger 
   - python39-python-jsonschema-objects 
+  - python39-python-keycloak 
   - python39-python-louvain 
   - python39-python-lsp-black 
   - python39-python-lsp-jsonrpc 
@@ -32253,7 +32255,6 @@ unsorted:
   - ruby3.1-doc 
   - ruby3.1-doc-ri 
   - ruby3.1-rubygem-rspec-rails-3.9 
-  - ruby3.1-rubygem-sinatra 
   - rubygem-docker-api 
   - rubygem-docker-api-doc 
   - rubygem-docker-api-testsuite 
@@ -33440,6 +33441,7 @@ unsorted:
   - terraform-provider-openstack: [x86_64] 
   - terraform-provider-template: [x86_64] 
   - terraform-provider-vsphere: [x86_64] 
+  - terragrunt 
   - teseq 
   - tesla-polyglot 
   - tesla-polyglot-atom 
@@ -43199,8 +43201,6 @@ unsorted:
   - wxmp3gain 
   - wxmp3gain-lang 
   - wxsqlite3-devel 
-  - wxstedit 
-  - wxstedit-devel 
   - wxsvg 
   - wyrmgus 
   - wyrmgus-devel