diff --git a/.files b/.files
index c7eb10d..7035ea2 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index d0f8040..da49c7f 100644
--- a/.rev
+++ b/.rev
@@ -27879,4 +27879,11 @@
     <user>staging-bot</user>
     <comment>Automatic update</comment>
   </revision>
+  <revision rev="3984" vrev="3984">
+    <srcmd5>f047a181695efd65e2eee27cb5b1511c</srcmd5>
+    <version>unknown</version>
+    <time>1713489365</time>
+    <user>staging-bot</user>
+    <comment>Automatic update</comment>
+  </revision>
 </revisionlist>
diff --git a/Aeon.product b/Aeon.product
index dffbaa9..b54fa6d 100644
--- a/Aeon.product
+++ b/Aeon.product
@@ -6,7 +6,7 @@
       <name>Aeon</name>
       <releasepkgname>Aeon-release</releasepkgname>
       <endoflife/>
-      <version>20240417</version>
+      <version>20240418</version>
       <!-- release is no longer optional -->
       <release>0</release>
       <productline>Aeon</productline>
diff --git a/Kalpa.product b/Kalpa.product
index fea06ce..c8125c5 100644
--- a/Kalpa.product
+++ b/Kalpa.product
@@ -6,7 +6,7 @@
       <name>Kalpa</name>
       <releasepkgname>Kalpa-release</releasepkgname>
       <endoflife/>
-      <version>20240417</version>
+      <version>20240418</version>
       <!-- release is no longer optional -->
       <release>0</release>
       <productline>Kalpa</productline>
diff --git a/MicroOS-dvd5-dvd-x86_64.kiwi b/MicroOS-dvd5-dvd-x86_64.kiwi
index 7676e4c..5aaa51b 100644
--- a/MicroOS-dvd5-dvd-x86_64.kiwi
+++ b/MicroOS-dvd5-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__MicroOS___20240417" schemaversion="4.1">
+<image name="OBS__MicroOS___20240418" 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">20240417</productvar>
+      <productvar name="VERSION">20240418</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20240417,openSUSE MicroOS</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20240418,openSUSE MicroOS</productinfo>
       <productinfo name="LINGUAS">en_US </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20240417/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20240418/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 e7a92df..6b71da6 100644
--- a/MicroOS.product
+++ b/MicroOS.product
@@ -6,7 +6,7 @@
       <name>MicroOS</name>
       <releasepkgname>MicroOS-release</releasepkgname>
       <endoflife/>
-      <version>20240417</version>
+      <version>20240418</version>
       <!-- release is no longer optional -->
       <release>0</release>
       <productline>MicroOS</productline>
diff --git a/dvd.group b/dvd.group
index 2d4fe2e..f60ff56 100644
--- a/dvd.group
+++ b/dvd.group
@@ -741,7 +741,7 @@
     <package name="gtksourceview5-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gucharmap" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
     <package name="gucharmap-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
-    <package name="guestfs-tools" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_tools -->
+    <package name="guestfs-tools" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="guile" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="guile-modules-3_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="gupnp-av" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -2184,8 +2184,9 @@
     <package name="libgudev-1_0-0" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="libguestfs" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="libguestfs-appliance" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
+    <package name="libguestfs-winsupport" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="libguestfs-xfs" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
-    <package name="libguestfs0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_tools -->
+    <package name="libguestfs0" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="libguile-3_0-1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="libgupnp-1_6-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libgupnp-av-1_0-3" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -2446,7 +2447,8 @@
     <package name="libmysofa1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libmythes-1_2-0" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="libnautilus-extension4" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="libnbd0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_tools -->
+    <package name="libnbd" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
+    <package name="libnbd0" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="libncurses6" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="libndctl6" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
     <package name="libndp0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -3177,15 +3179,15 @@
     <package name="nautilus-share" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="nautilus-share-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="nbd" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="nbdkit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_tools -->
-    <package name="nbdkit-basic-filters" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_tools -->
-    <package name="nbdkit-basic-plugins" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_tools -->
-    <package name="nbdkit-curl-plugin" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_tools -->
-    <package name="nbdkit-nbd-plugin" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_tools -->
-    <package name="nbdkit-python-plugin" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_tools -->
-    <package name="nbdkit-server" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_tools -->
-    <package name="nbdkit-ssh-plugin" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_tools -->
-    <package name="nbdkit-vddk-plugin" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_tools -->
+    <package name="nbdkit" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
+    <package name="nbdkit-basic-filters" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
+    <package name="nbdkit-basic-plugins" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
+    <package name="nbdkit-curl-plugin" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
+    <package name="nbdkit-nbd-plugin" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
+    <package name="nbdkit-python-plugin" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
+    <package name="nbdkit-server" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
+    <package name="nbdkit-ssh-plugin" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
+    <package name="nbdkit-vddk-plugin" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="ncompress" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="ncurses-utils" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="net-snmp" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
@@ -4217,8 +4219,8 @@
     <package name="virt-install" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_tools -->
     <package name="virt-manager" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_tools -->
     <package name="virt-manager-common" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_tools -->
-    <package name="virt-v2v" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_tools -->
-    <package name="virt-v2v-bash-completion" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_tools -->
+    <package name="virt-v2v" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
+    <package name="virt-v2v-bash-completion" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="virt-viewer" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_tools -->
     <package name="virt-what" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="virtiofsd" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
diff --git a/openSUSE-Addon-NonOss-ftp-ftp-x86_64.kiwi b/openSUSE-Addon-NonOss-ftp-ftp-x86_64.kiwi
index 14245a3..b0c8ec3 100644
--- a/openSUSE-Addon-NonOss-ftp-ftp-x86_64.kiwi
+++ b/openSUSE-Addon-NonOss-ftp-ftp-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE-Addon-NonOss___20240417" schemaversion="4.1">
+<image name="OBS__openSUSE-Addon-NonOss___20240418" 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">20240417</productvar>
+      <productvar name="VERSION">20240418</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20240417,openSUSE NonOSS Addon</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20240418,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/20240417/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20240418/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 8c2a8a8..51479de 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>20240417</version>
+        <version>20240418</version>
         <release>0</release> 
         <summary>openSUSE NonOSS Addon</summary>
         <shortsummary>non oss addon</shortsummary>
diff --git a/openSUSE-cd-mini-x86_64.kiwi b/openSUSE-cd-mini-x86_64.kiwi
index a21fbb0..8792101 100644
--- a/openSUSE-cd-mini-x86_64.kiwi
+++ b/openSUSE-cd-mini-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20240417" schemaversion="4.1">
+<image name="OBS__openSUSE___20240418" 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">20240417</productvar>
+      <productvar name="VERSION">20240418</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20240417,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20240418,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/20240417/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20240418/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-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index 6a63e96..dc78855 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20240417" schemaversion="4.1">
+<image name="OBS__openSUSE___20240418" 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">20240417</productvar>
+      <productvar name="VERSION">20240418</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20240417,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20240418,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/20240417/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20240418/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>
@@ -1736,6 +1736,7 @@
       <repopackage name="libgudev-1_0-0"/>
       <repopackage name="libguestfs"/>
       <repopackage name="libguestfs-appliance"/>
+      <repopackage name="libguestfs-winsupport"/>
       <repopackage name="libguestfs-xfs"/>
       <repopackage name="libguestfs0"/>
       <repopackage name="libguile-3_0-1"/>
@@ -2299,6 +2300,7 @@
       <repopackage name="libmysofa1"/>
       <repopackage name="libmythes-1_2-0"/>
       <repopackage name="libnautilus-extension4"/>
+      <repopackage name="libnbd"/>
       <repopackage name="libnbd0"/>
       <repopackage name="libncurses6"/>
       <repopackage name="libndctl6"/>
diff --git a/openSUSE-ftp-ftp-x86_64.kiwi b/openSUSE-ftp-ftp-x86_64.kiwi
index bab283d..25a1e64 100644
--- a/openSUSE-ftp-ftp-x86_64.kiwi
+++ b/openSUSE-ftp-ftp-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20240417" schemaversion="4.1">
+<image name="OBS__openSUSE___20240418" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -23,7 +23,7 @@
       <productvar name="DISTNAME">openSUSE</productvar>
       <productvar name="FLAVOR">ftp</productvar>
       <productvar name="MAKE_LISTINGS">true</productvar>
-      <productvar name="MEDIUM_NAME">openSUSE-20240417-x86_64</productvar>
+      <productvar name="MEDIUM_NAME">openSUSE-20240418-x86_64</productvar>
       <productvar name="MULTIPLE_MEDIA">true</productvar>
       <productvar name="PRODUCT_DIR">/</productvar>
       <productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar>
@@ -35,11 +35,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20240417</productvar>
+      <productvar name="VERSION">20240418</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20240417,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20240418,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/20240417/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20240418/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 d6a1a20..04ec764 100644
--- a/openSUSE.product
+++ b/openSUSE.product
@@ -4,7 +4,7 @@
     <product>
       <vendor>openSUSE</vendor>
       <name>openSUSE</name>
-      <version>20240417</version>
+      <version>20240418</version>
       <release>0</release>
 
       <productline>openSUSE</productline>
diff --git a/unsorted.yml b/unsorted.yml
index c1992c1..8b165c2 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -2507,6 +2507,7 @@ unsorted:
   - coredns-for-k8s1.28-extras 
   - coredns-for-k8s1.29 
   - coredns-for-k8s1.29-extras 
+  - coreos-installer 
   - corepack20 
   - corepack21 
   - coreutils-single 
@@ -13317,7 +13318,6 @@ unsorted:
   - libguestfs-rescue 
   - libguestfs-rsync 
   - libguestfs-typelib-Guestfs-1_0 
-  - libguestfs-winsupport 
   - libguestfsd 
   - libguile-cairo0 
   - libguile-srfi-srfi-1-v-3-3 
@@ -14338,7 +14338,6 @@ unsorted:
   - libnauty-2_8_8 
   - libnbcompat-devel 
   - libnbcompat0 
-  - libnbd 
   - libnbd-bash-completion 
   - libnbd-devel 
   - libnblib_gmx0 
@@ -14785,6 +14784,7 @@ unsorted:
   - libout123-0-32bit 
   - libovf-glib-devel 
   - libovn-23_03-0 
+  - libowfat-devel 
   - libowncloudsync-devel 
   - libowncloudsync0 
   - libp11-devel 
@@ -18416,6 +18416,8 @@ unsorted:
   - moditect-javadoc 
   - modsecurity 
   - modsecurity-devel 
+  - modulemaker-maven-plugin 
+  - modulemaker-maven-plugin-javadoc 
   - modulemd-validator 
   - moe 
   - mojave-gtk-theme 
@@ -19413,6 +19415,8 @@ unsorted:
   - ntp 
   - ntp-dcf77-tools 
   - ntp-doc 
+  - ntpd-rs 
+  - ntpd-rs-common 
   - ntpsec 
   - ntpsec-devel 
   - ntpsec-doc