diff --git a/MicroOS-dvd5-dvd-x86_64.kiwi b/MicroOS-dvd5-dvd-x86_64.kiwi
index fe2d51ed..89e26a82 100644
--- a/MicroOS-dvd5-dvd-x86_64.kiwi
+++ b/MicroOS-dvd5-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__MicroOS___20210424" schemaversion="4.1">
+<image name="OBS__MicroOS___20210425" 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">20210424</productvar>
+      <productvar name="VERSION">20210425</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20210424,openSUSE MicroOS</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20210425,openSUSE MicroOS</productinfo>
       <productinfo name="LINGUAS">en_US </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20210424/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20210425/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 a70ce915..d909719c 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___20210424" schemaversion="4.1">
+<image name="OBS__MicroOS___20210425" 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">20210424</productvar>
+      <productvar name="VERSION">20210425</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20210424,openSUSE MicroOS</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20210425,openSUSE MicroOS</productinfo>
       <productinfo name="LINGUAS">en_US </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20210424/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20210425/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 9621c315..a884f5b1 100644
--- a/MicroOS.product
+++ b/MicroOS.product
@@ -6,7 +6,7 @@
       <name>MicroOS</name>
       <releasepkgname>MicroOS-release</releasepkgname>
       <endoflife/>
-      <version>20210424</version>
+      <version>20210425</version>
       <!-- release is no longer optional -->
       <release>0</release>
       <productline>MicroOS</productline>
diff --git a/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi b/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi
index ed1923a8..9dd94b6c 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___20210424" schemaversion="4.1">
+<image name="OBS__openSUSE-Addon-NonOss___20210425" 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">20210424</productvar>
+      <productvar name="VERSION">20210425</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20210424,openSUSE NonOSS Addon</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20210425,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/20210424/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20210424/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20210425/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20210425/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 4985327c..1eb56763 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>20210424</version>
+        <version>20210425</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 130c5280..46d2e17c 100644
--- a/openSUSE-cd-mini-i586.kiwi
+++ b/openSUSE-cd-mini-i586.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20210424" schemaversion="4.1">
+<image name="OBS__openSUSE___20210425" 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">20210424</productvar>
+      <productvar name="VERSION">20210425</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210424,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210425,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/20210424/i586</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210425/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 83c78830..2a33f82f 100644
--- a/openSUSE-cd-mini-x86_64.kiwi
+++ b/openSUSE-cd-mini-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20210424" schemaversion="4.1">
+<image name="OBS__openSUSE___20210425" 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">20210424</productvar>
+      <productvar name="VERSION">20210425</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210424,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210425,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/20210424/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210425/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 52b4d186..946dafe3 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20210424" schemaversion="4.1">
+<image name="OBS__openSUSE___20210425" 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">20210424</productvar>
+      <productvar name="VERSION">20210425</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210424,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210425,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/20210424/i586</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210425/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-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index f54f864e..78bc3d58 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20210424" schemaversion="4.1">
+<image name="OBS__openSUSE___20210425" 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">20210424</productvar>
+      <productvar name="VERSION">20210425</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210424,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210425,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/20210424/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210425/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-ftp-ftp-i586_x86_64.kiwi b/openSUSE-ftp-ftp-i586_x86_64.kiwi
index faabc474..be3e7438 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___20210424" schemaversion="4.1">
+<image name="OBS__openSUSE___20210425" 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-20210424-i586-x86_64</productvar>
+      <productvar name="MEDIUM_NAME">openSUSE-20210425-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">20210424</productvar>
+      <productvar name="VERSION">20210425</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210424,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210425,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/20210424/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210424/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210425/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210425/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 94cf5494..95919f14 100644
--- a/openSUSE.product
+++ b/openSUSE.product
@@ -4,7 +4,7 @@
     <product>
       <vendor>openSUSE</vendor>
       <name>openSUSE</name>
-      <version>20210424</version>
+      <version>20210425</version>
       <release>0</release>
 
       <productline>openSUSE</productline>
diff --git a/unsorted.yml b/unsorted.yml
index fb12ba0d..4a1f1f69 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -7946,6 +7946,9 @@ unsorted:
   - kontactinterface-devel 
   - kontrast 
   - kontrast-lang 
+  - kopeninghours 
+  - kopeninghours-devel 
+  - kopeninghours-lang 
   - kopete-devel 
   - kosmindoormap 
   - kosmindoormap-devel 
@@ -8636,6 +8639,7 @@ unsorted:
   - libKF5XmlRpcClient5-lang 
   - libKOSM1 
   - libKOSMIndoorMap1 
+  - libKOpeningHours1 
   - libKPimAddressbookImportExport5-devel 
   - libKPimGAPIBlogger5 
   - libKPimGAPIDrive5 
@@ -17788,6 +17792,7 @@ unsorted:
   - openttd-dedicated 
   - openttd-opengfx 
   - openttd-openmsx 
+  - openttd-opensfx 
   - opentyrian 
   - openucx-tools: [x86_64] 
   - openvas-smb 
@@ -20876,6 +20881,7 @@ unsorted:
   - python3-clustershell 
   - python3-coconut 
   - python3-congressclient 
+  - python3-ctypeslib2 
   - python3-dbus-presage 
   - python3-debtcollector 
   - python3-deltarpm 
@@ -21932,6 +21938,7 @@ unsorted:
   - python36-csvkit 
   - python36-ctypescrypto 
   - python36-curio 
+  - python36-curlylint 
   - python36-curses 
   - python36-curtsies 
   - python36-cwcwidth 
@@ -24726,10 +24733,10 @@ unsorted:
   - python38-csv23 
   - python38-csvkit 
   - python38-ctypescrypto 
-  - python38-ctypeslib2 
   - python38-cu2qu 
   - python38-cufflinks 
   - python38-curio 
+  - python38-curlylint 
   - python38-curtsies 
   - python38-cwcwidth 
   - python38-cx_Freeze 
@@ -27643,6 +27650,7 @@ unsorted:
   - python39-cu2qu 
   - python39-cufflinks 
   - python39-curio 
+  - python39-curlylint 
   - python39-curses 
   - python39-curtsies 
   - python39-cwcwidth 
@@ -29334,6 +29342,7 @@ unsorted:
   - python39-sh 
   - python39-shaptools 
   - python39-shellingham 
+  - python39-sherpa: [x86_64] 
   - python39-shijian 
   - python39-shodan 
   - python39-shortuuid