diff --git a/MicroOS-dvd5-dvd-x86_64.kiwi b/MicroOS-dvd5-dvd-x86_64.kiwi
index 4c8bdb69..c570ebc3 100644
--- a/MicroOS-dvd5-dvd-x86_64.kiwi
+++ b/MicroOS-dvd5-dvd-x86_64.kiwi
@@ -531,8 +531,6 @@
       <repopackage name="libdbus-glib-1-2" arch="x86_64"/>
       <repopackage name="libdbusmenu-qt5-2" arch="x86_64"/>
       <repopackage name="libdc1394-25" arch="x86_64"/>
-      <repopackage name="libdcerpc-binding0" arch="x86_64"/>
-      <repopackage name="libdcerpc0" arch="x86_64"/>
       <repopackage name="libdconf1" arch="x86_64"/>
       <repopackage name="libdevmapper-event1_03" arch="x86_64"/>
       <repopackage name="libdevmapper1_03"/>
@@ -856,12 +854,7 @@
       <repopackage name="libnautilus-extension1" arch="x86_64"/>
       <repopackage name="libncurses6"/>
       <repopackage name="libndp0" arch="x86_64"/>
-      <repopackage name="libndr-krb5pac0" arch="x86_64"/>
-      <repopackage name="libndr-nbt0" arch="x86_64"/>
-      <repopackage name="libndr-standard0" arch="x86_64"/>
-      <repopackage name="libndr2" arch="x86_64"/>
       <repopackage name="libneon27" arch="x86_64"/>
-      <repopackage name="libnetapi0" arch="x86_64"/>
       <repopackage name="libnetfilter_conntrack3" arch="x86_64"/>
       <repopackage name="libnettle8" arch="x86_64"/>
       <repopackage name="libnewt0_52" arch="x86_64"/>
@@ -992,12 +985,6 @@
       <repopackage name="librepo0" arch="x86_64"/>
       <repopackage name="librest-0_7-0" arch="x86_64"/>
       <repopackage name="librsvg-2-2" arch="x86_64"/>
-      <repopackage name="libsamba-credentials1" arch="x86_64"/>
-      <repopackage name="libsamba-errors0" arch="x86_64"/>
-      <repopackage name="libsamba-hostconfig0" arch="x86_64"/>
-      <repopackage name="libsamba-passdb0" arch="x86_64"/>
-      <repopackage name="libsamba-util0" arch="x86_64"/>
-      <repopackage name="libsamdb0" arch="x86_64"/>
       <repopackage name="libsasl2-3"/>
       <repopackage name="libsbc1" arch="x86_64"/>
       <repopackage name="libseccomp2"/>
@@ -1016,10 +1003,7 @@
       <repopackage name="libslp1" arch="x86_64"/>
       <repopackage name="libSM6" arch="x86_64"/>
       <repopackage name="libsmartcols1"/>
-      <repopackage name="libsmbclient0" arch="x86_64"/>
-      <repopackage name="libsmbconf0" arch="x86_64"/>
       <repopackage name="libsmbios_c2" arch="x86_64"/>
-      <repopackage name="libsmbldap2" arch="x86_64"/>
       <repopackage name="libsnapper5" arch="x86_64"/>
       <repopackage name="libsnappy1"/>
       <repopackage name="libsndfile1" arch="x86_64"/>
@@ -1056,7 +1040,6 @@
       <repopackage name="libteamdctl0" arch="x86_64"/>
       <repopackage name="libtelepathy-glib0" arch="x86_64"/>
       <repopackage name="libtelepathy-logger3" arch="x86_64"/>
-      <repopackage name="libtevent-util0" arch="x86_64"/>
       <repopackage name="libtevent0" arch="x86_64"/>
       <repopackage name="libtextstyle0" arch="x86_64"/>
       <repopackage name="libthai-data" arch="x86_64"/>
@@ -1114,7 +1097,6 @@
       <repopackage name="libwayland-cursor0" arch="x86_64"/>
       <repopackage name="libwayland-egl1" arch="x86_64"/>
       <repopackage name="libwayland-server0" arch="x86_64"/>
-      <repopackage name="libwbclient0" arch="x86_64"/>
       <repopackage name="libwebkit2gtk-4_0-37" arch="x86_64"/>
       <repopackage name="libwebkit2gtk-4_1-0" arch="x86_64"/>
       <repopackage name="libwebp7" arch="x86_64"/>
@@ -1474,6 +1456,7 @@
       <repopackage name="runc" arch="x86_64"/>
       <repopackage name="samba" arch="x86_64"/>
       <repopackage name="samba-client" arch="x86_64"/>
+      <repopackage name="samba-client-libs" arch="x86_64"/>
       <repopackage name="samba-libs" arch="x86_64"/>
       <repopackage name="sddm" arch="x86_64"/>
       <repopackage name="sddm-branding-openSUSE" arch="x86_64"/>
diff --git a/dvd.group b/dvd.group
index 219ba19d..74b98cb0 100644
--- a/dvd.group
+++ b/dvd.group
@@ -1772,8 +1772,6 @@
     <package name="libdbusmenu-gtk3-4" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libdbusmenu-qt5-2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="libdc1394-25" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="libdcerpc-binding0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="libdcerpc0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libdconf1" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libdebuginfod1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="libdeflt1_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -2275,12 +2273,7 @@
     <package name="libnautilus-extension1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libncurses6" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libndp0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="libndr-krb5pac0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="libndr-nbt0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="libndr-standard0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="libndr2" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libneon27" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="libnetapi0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libnetcontrol0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-xen_server -->
     <package name="libnetfilter_conntrack3" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libnetpbm11" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
@@ -2537,13 +2530,7 @@
     <package name="libruby3_0-3_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="librygel-core-2_6-2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="librygel-server-2_6-2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="libsamba-credentials1" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="libsamba-errors0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="libsamba-hostconfig0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="libsamba-passdb0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libsamba-policy0-python3" supportstatus="unsupported"/> <!-- reason: dvd:patterns-yast-yast2_server -->
-    <package name="libsamba-util0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="libsamdb0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libsamplerate0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libsane1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libsasl2-3" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -2574,11 +2561,8 @@
     <package name="libslirp0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
     <package name="libslp1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="libsmartcols1" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="libsmbclient0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="libsmbconf0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libsmbios-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libsmbios_c2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="libsmbldap2" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libsmi" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libsmi2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libsmputils1-1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
@@ -2647,7 +2631,6 @@
     <package name="libteamdctl0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libtelepathy-glib0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libtelepathy-logger3" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="libtevent-util0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libtevent0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libtextstyle0" supportstatus="unsupported"/> <!-- reason: dvd:grub2 -->
     <package name="libthai-data" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -2757,7 +2740,6 @@
     <package name="libwayland-cursor0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libwayland-egl1" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libwayland-server0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="libwbclient0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libwebkit2gtk-4_0-37" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libwebkit2gtk-4_1-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_basis -->
     <package name="libwebp7" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -3576,7 +3558,7 @@
     <package name="python3-cupshelpers" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python3-firewall" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="python3-gedit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="python3-ldb" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
+    <package name="python3-ldb" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python3-louis" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python3-nftables" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="python3-policycoreutils" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-selinux -->
@@ -3586,7 +3568,7 @@
     <package name="python3-smbios-utils" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="python3-solv" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="python3-speechd" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="python3-talloc" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
+    <package name="python3-talloc" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python3-tdb" supportstatus="unsupported"/> <!-- reason: dvd:patterns-yast-yast2_server -->
     <package name="python3-tevent" supportstatus="unsupported"/> <!-- reason: dvd:patterns-yast-yast2_server -->
     <package name="python38" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -4288,14 +4270,17 @@
     <package name="salt-minion" supportstatus="unsupported"/> <!-- reason: dvd:salt-minion -->
     <package name="salt-transactional-update" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="samba" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="samba-ad-dc-libs" supportstatus="unsupported"/> <!-- reason: dvd:patterns-yast-yast2_server -->
     <package name="samba-client" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="samba-client-libs" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="samba-doc" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="samba-gpupdate" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="samba-ldb-ldap" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="samba-libs" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="samba-libs-python3" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
+    <package name="samba-libs" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="samba-libs-python3" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="samba-python3" supportstatus="unsupported"/> <!-- reason: dvd:patterns-yast-yast2_server -->
     <package name="samba-winbind" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-file_server -->
+    <package name="samba-winbind-libs" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-file_server -->
     <package name="sane-backends" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="sane-backends-autoconfig" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="sasl2-kdexoauth2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
@@ -5173,8 +5158,6 @@
     <package name="libcups2-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libdatrie1-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libdbus-1-3-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="libdcerpc-binding0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="libdcerpc0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libdevmapper1_03-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libdrm-devel" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libeconf0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
@@ -5225,11 +5208,6 @@
     <package name="libmfx1" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libmount1-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libndctl6" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
-    <package name="libndr-krb5pac0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="libndr-nbt0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="libndr-standard0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="libndr2-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="libnetapi0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libnettle8-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libnscd1-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libnsl3-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
@@ -5251,16 +5229,8 @@
     <package name="libpwquality1-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="librados2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
     <package name="librbd1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
-    <package name="libsamba-credentials1-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="libsamba-errors0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="libsamba-hostconfig0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="libsamba-passdb0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="libsamba-util0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="libsamdb0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libsasl2-3-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libselinux1-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="libsmbconf0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="libsmbldap2-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libspf2-2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libstdc++6-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libstdc++6-pp-gcc11-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
@@ -5270,7 +5240,6 @@
     <package name="libtalloc2-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libtasn1-6-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libtdb1-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="libtevent-util0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libtevent0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libthai0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libtiff5-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
@@ -5294,7 +5263,6 @@
     <package name="libvirt-sandbox-1_0-5" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libvorbis0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libvorbisfile3-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="libwbclient0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libwx_baseu-suse-nostl5_0_0" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libwx_baseu_net-suse-nostl5_0_0" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libwx_baseu_xml-suse-nostl5_0_0" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -5388,8 +5356,8 @@
     <package name="qemu-uefi-aarch64" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="rtl8812au-kmp-default" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="samba-client-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="samba-libs-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="samba-winbind-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="samba-client-libs-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+    <package name="samba-winbind-libs-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="scim-gtk-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="shim" supportstatus="unsupported"/> <!-- reason: dvd:shim -->
     <package name="skopeo" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index 184f9a25..3b626faa 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -1519,8 +1519,6 @@
       <repopackage name="libdbusmenu-gtk3-4"/>
       <repopackage name="libdbusmenu-qt5-2"/>
       <repopackage name="libdc1394-25"/>
-      <repopackage name="libdcerpc-binding0"/>
-      <repopackage name="libdcerpc0"/>
       <repopackage name="libdconf1"/>
       <repopackage name="libdebuginfod1"/>
       <repopackage name="libdeflt1_0"/>
@@ -2192,12 +2190,7 @@
       <repopackage name="libnautilus-extension1"/>
       <repopackage name="libncurses6"/>
       <repopackage name="libndp0"/>
-      <repopackage name="libndr-krb5pac0"/>
-      <repopackage name="libndr-nbt0"/>
-      <repopackage name="libndr-standard0"/>
-      <repopackage name="libndr2"/>
       <repopackage name="libneon27"/>
-      <repopackage name="libnetapi0"/>
       <repopackage name="libnetcontrol0"/>
       <repopackage name="libnetfilter_conntrack3"/>
       <repopackage name="libnetpbm11"/>
@@ -2500,13 +2493,7 @@
       <repopackage name="libruby3_0-3_0"/>
       <repopackage name="librygel-core-2_6-2"/>
       <repopackage name="librygel-server-2_6-2"/>
-      <repopackage name="libsamba-credentials1"/>
-      <repopackage name="libsamba-errors0"/>
-      <repopackage name="libsamba-hostconfig0"/>
-      <repopackage name="libsamba-passdb0"/>
       <repopackage name="libsamba-policy0-python3"/>
-      <repopackage name="libsamba-util0"/>
-      <repopackage name="libsamdb0"/>
       <repopackage name="libsamplerate0"/>
       <repopackage name="libsane1"/>
       <repopackage name="libsasl2-3"/>
@@ -2543,11 +2530,8 @@
       <repopackage name="libslp1"/>
       <repopackage name="libSM6"/>
       <repopackage name="libsmartcols1"/>
-      <repopackage name="libsmbclient0"/>
-      <repopackage name="libsmbconf0"/>
       <repopackage name="libsmbios-lang"/>
       <repopackage name="libsmbios_c2"/>
-      <repopackage name="libsmbldap2"/>
       <repopackage name="libsmi"/>
       <repopackage name="libsmi2"/>
       <repopackage name="libsmputils1-1"/>
@@ -2618,7 +2602,6 @@
       <repopackage name="libteamdctl0"/>
       <repopackage name="libtelepathy-glib0"/>
       <repopackage name="libtelepathy-logger3"/>
-      <repopackage name="libtevent-util0"/>
       <repopackage name="libtevent0"/>
       <repopackage name="libtextstyle0"/>
       <repopackage name="libthai-data"/>
@@ -2729,7 +2712,6 @@
       <repopackage name="libwayland-cursor0"/>
       <repopackage name="libwayland-egl1"/>
       <repopackage name="libwayland-server0"/>
-      <repopackage name="libwbclient0"/>
       <repopackage name="libwebkit2gtk-4_0-37"/>
       <repopackage name="libwebkit2gtk-4_1-0"/>
       <repopackage name="libwebp7"/>
@@ -4337,7 +4319,9 @@
       <repopackage name="salt-minion"/>
       <repopackage name="salt-transactional-update"/>
       <repopackage name="samba"/>
+      <repopackage name="samba-ad-dc-libs"/>
       <repopackage name="samba-client"/>
+      <repopackage name="samba-client-libs"/>
       <repopackage name="samba-doc"/>
       <repopackage name="samba-gpupdate"/>
       <repopackage name="samba-ldb-ldap"/>
@@ -4345,6 +4329,7 @@
       <repopackage name="samba-libs-python3"/>
       <repopackage name="samba-python3"/>
       <repopackage name="samba-winbind"/>
+      <repopackage name="samba-winbind-libs"/>
       <repopackage name="sane-backends"/>
       <repopackage name="sane-backends-autoconfig"/>
       <repopackage name="sasl2-kdexoauth2"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index d57ddcb7..2240654a 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -1614,10 +1614,6 @@
       <repopackage name="libdbusmenu-gtk3-4"/>
       <repopackage name="libdbusmenu-qt5-2"/>
       <repopackage name="libdc1394-25"/>
-      <repopackage name="libdcerpc-binding0"/>
-      <repopackage name="libdcerpc-binding0-32bit" arch="x86_64"/>
-      <repopackage name="libdcerpc0"/>
-      <repopackage name="libdcerpc0-32bit" arch="x86_64"/>
       <repopackage name="libdconf1"/>
       <repopackage name="libdebuginfod1"/>
       <repopackage name="libdeflt1_0"/>
@@ -2342,17 +2338,7 @@
       <repopackage name="libncurses6"/>
       <repopackage name="libndctl6" arch="x86_64"/>
       <repopackage name="libndp0"/>
-      <repopackage name="libndr-krb5pac0"/>
-      <repopackage name="libndr-krb5pac0-32bit" arch="x86_64"/>
-      <repopackage name="libndr-nbt0"/>
-      <repopackage name="libndr-nbt0-32bit" arch="x86_64"/>
-      <repopackage name="libndr-standard0"/>
-      <repopackage name="libndr-standard0-32bit" arch="x86_64"/>
-      <repopackage name="libndr2"/>
-      <repopackage name="libndr2-32bit" arch="x86_64"/>
       <repopackage name="libneon27"/>
-      <repopackage name="libnetapi0"/>
-      <repopackage name="libnetapi0-32bit" arch="x86_64"/>
       <repopackage name="libnetcontrol0"/>
       <repopackage name="libnetfilter_conntrack3"/>
       <repopackage name="libnetpbm11"/>
@@ -2675,19 +2661,7 @@
       <repopackage name="libruby3_0-3_0"/>
       <repopackage name="librygel-core-2_6-2"/>
       <repopackage name="librygel-server-2_6-2"/>
-      <repopackage name="libsamba-credentials1"/>
-      <repopackage name="libsamba-credentials1-32bit" arch="x86_64"/>
-      <repopackage name="libsamba-errors0"/>
-      <repopackage name="libsamba-errors0-32bit" arch="x86_64"/>
-      <repopackage name="libsamba-hostconfig0"/>
-      <repopackage name="libsamba-hostconfig0-32bit" arch="x86_64"/>
-      <repopackage name="libsamba-passdb0"/>
-      <repopackage name="libsamba-passdb0-32bit" arch="x86_64"/>
       <repopackage name="libsamba-policy0-python3"/>
-      <repopackage name="libsamba-util0"/>
-      <repopackage name="libsamba-util0-32bit" arch="x86_64"/>
-      <repopackage name="libsamdb0"/>
-      <repopackage name="libsamdb0-32bit" arch="x86_64"/>
       <repopackage name="libsamplerate0"/>
       <repopackage name="libsane1"/>
       <repopackage name="libsasl2-3"/>
@@ -2728,13 +2702,8 @@
       <repopackage name="libSM6"/>
       <repopackage name="libSM6-32bit" arch="x86_64"/>
       <repopackage name="libsmartcols1"/>
-      <repopackage name="libsmbclient0"/>
-      <repopackage name="libsmbconf0"/>
-      <repopackage name="libsmbconf0-32bit" arch="x86_64"/>
       <repopackage name="libsmbios-lang"/>
       <repopackage name="libsmbios_c2"/>
-      <repopackage name="libsmbldap2"/>
-      <repopackage name="libsmbldap2-32bit" arch="x86_64"/>
       <repopackage name="libsmi"/>
       <repopackage name="libsmi2"/>
       <repopackage name="libsmputils1-1"/>
@@ -2815,8 +2784,6 @@
       <repopackage name="libteamdctl0"/>
       <repopackage name="libtelepathy-glib0"/>
       <repopackage name="libtelepathy-logger3"/>
-      <repopackage name="libtevent-util0"/>
-      <repopackage name="libtevent-util0-32bit" arch="x86_64"/>
       <repopackage name="libtevent0"/>
       <repopackage name="libtevent0-32bit" arch="x86_64"/>
       <repopackage name="libtextstyle0"/>
@@ -2950,8 +2917,6 @@
       <repopackage name="libwayland-cursor0"/>
       <repopackage name="libwayland-egl1"/>
       <repopackage name="libwayland-server0"/>
-      <repopackage name="libwbclient0"/>
-      <repopackage name="libwbclient0-32bit" arch="x86_64"/>
       <repopackage name="libwebkit2gtk-4_0-37"/>
       <repopackage name="libwebkit2gtk-4_1-0"/>
       <repopackage name="libwebp7"/>
@@ -4678,17 +4643,20 @@
       <repopackage name="salt-minion"/>
       <repopackage name="salt-transactional-update"/>
       <repopackage name="samba"/>
+      <repopackage name="samba-ad-dc-libs"/>
       <repopackage name="samba-client"/>
       <repopackage name="samba-client-32bit" arch="x86_64"/>
+      <repopackage name="samba-client-libs"/>
+      <repopackage name="samba-client-libs-32bit" arch="x86_64"/>
       <repopackage name="samba-doc"/>
       <repopackage name="samba-gpupdate"/>
       <repopackage name="samba-ldb-ldap"/>
       <repopackage name="samba-libs"/>
-      <repopackage name="samba-libs-32bit" arch="x86_64"/>
       <repopackage name="samba-libs-python3"/>
       <repopackage name="samba-python3"/>
       <repopackage name="samba-winbind"/>
-      <repopackage name="samba-winbind-32bit" arch="x86_64"/>
+      <repopackage name="samba-winbind-libs"/>
+      <repopackage name="samba-winbind-libs-32bit" arch="x86_64"/>
       <repopackage name="sane-backends"/>
       <repopackage name="sane-backends-autoconfig"/>
       <repopackage name="sasl2-kdexoauth2"/>
diff --git a/opensuse_microos.group b/opensuse_microos.group
index 78880d30..658f3854 100644
--- a/opensuse_microos.group
+++ b/opensuse_microos.group
@@ -734,8 +734,6 @@
     <package name="libdbus-glib-1-2" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-gnome -->
     <package name="libdbusmenu-qt5-2" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="libdc1394-25" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-gnome -->
-    <package name="libdcerpc-binding0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
-    <package name="libdcerpc0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="libdconf1" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="libdevmapper-event1_03" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-hardware -->
     <package name="libdhash1" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-sssd_ldap -->
@@ -954,12 +952,7 @@
     <package name="libmtp9" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="libnautilus-extension1" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-gnome -->
     <package name="libndp0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
-    <package name="libndr-krb5pac0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
-    <package name="libndr-nbt0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
-    <package name="libndr-standard0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
-    <package name="libndr2" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="libneon27" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-gnome -->
-    <package name="libnetapi0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="libnetfilter_conntrack3" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-base -->
     <package name="libnettle8" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-base -->
     <package name="libnewt0_52" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
@@ -1053,12 +1046,6 @@
     <package name="librepo0" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-base-microdnf -->
     <package name="librest-0_7-0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-gnome -->
     <package name="librsvg-2-2" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-onlyDVD -->
-    <package name="libsamba-credentials1" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
-    <package name="libsamba-errors0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
-    <package name="libsamba-hostconfig0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
-    <package name="libsamba-passdb0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
-    <package name="libsamba-util0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
-    <package name="libsamdb0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="libsbc1" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="libsecret-1-0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="libsemanage-conf" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-base -->
@@ -1071,10 +1058,7 @@
     <package name="libslang2" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="libslirp0" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-alt_onlyDVD -->
     <package name="libslp1" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-base-microdnf -->
-    <package name="libsmbclient0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
-    <package name="libsmbconf0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="libsmbios_c2" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-gnome -->
-    <package name="libsmbldap2" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="libsnapper5" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-base -->
     <package name="libsndfile1" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="libsnmp40" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
@@ -1104,7 +1088,6 @@
     <package name="libteamdctl0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="libtelepathy-glib0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-gnome -->
     <package name="libtelepathy-logger3" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-gnome -->
-    <package name="libtevent-util0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="libtevent0" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-sssd_ldap -->
     <package name="libtextstyle0" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-base -->
     <package name="libthai-data" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-onlyDVD -->
@@ -1157,7 +1140,6 @@
     <package name="libwayland-cursor0" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-onlyDVD -->
     <package name="libwayland-egl1" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-onlyDVD -->
     <package name="libwayland-server0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
-    <package name="libwbclient0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="libwebkit2gtk-4_0-37" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-gnome -->
     <package name="libwebkit2gtk-4_1-0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-gnome -->
     <package name="libwebp7" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-onlyDVD -->
@@ -1449,7 +1431,8 @@
     <package name="runc" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-alt_onlyDVD -->
     <package name="samba" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-gnome -->
     <package name="samba-client" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-gnome -->
-    <package name="samba-libs" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
+    <package name="samba-client-libs" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
+    <package name="samba-libs" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-gnome -->
     <package name="sddm" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="sddm-branding-openSUSE" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="sddm-theme-openSUSE" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
diff --git a/unsorted.yml b/unsorted.yml
index 3debefda..80fde041 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -10338,10 +10338,6 @@ unsorted:
   - libdc1394-25-32bit: [x86_64] 
   - libdc1394-devel 
   - libdc1394-tools 
-  - libdcerpc-devel 
-  - libdcerpc-samr-devel 
-  - libdcerpc-samr0 
-  - libdcerpc-samr0-32bit: [x86_64] 
   - libdcmtk3_6 
   - libdconf1-32bit: [x86_64] 
   - libddccontrol0 
@@ -12227,10 +12223,6 @@ unsorted:
   - libndp-devel 
   - libndpi-devel 
   - libndpi4 
-  - libndr-devel 
-  - libndr-krb5pac-devel 
-  - libndr-nbt-devel 
-  - libndr-standard-devel 
   - libneatvnc0 
   - libneko2 
   - libnemo-extension1 
@@ -12240,8 +12232,6 @@ unsorted:
   - libnet-devel 
   - libnet-doc 
   - libnet9 
-  - libnetapi-devel 
-  - libnetapi-devel-32bit: [x86_64] 
   - libnetcdf-cxx4-gnu-hpc 
   - libnetcdf-cxx4-gnu-hpc-devel 
   - libnetcdf-cxx4_4_3_1-gnu-hpc 
@@ -13544,15 +13534,9 @@ unsorted:
   - libs3-tools 
   - libsam4 
   - libsam4-32bit: [x86_64] 
-  - libsamba-credentials-devel 
-  - libsamba-errors-devel 
-  - libsamba-hostconfig-devel 
-  - libsamba-passdb-devel 
   - libsamba-policy-devel 
   - libsamba-policy-python3-devel 
   - libsamba-policy0-python3-32bit: [x86_64] 
-  - libsamba-util-devel 
-  - libsamdb-devel 
   - libsaml-devel 
   - libsaml12 
   - libsamplerate-devel 
@@ -13722,11 +13706,7 @@ unsorted:
   - libsmartcols-devel-32bit: [x86_64] 
   - libsmartcols-devel-static 
   - libsmartcols1-32bit: [x86_64] 
-  - libsmbclient-devel 
-  - libsmbclient0-32bit: [x86_64] 
-  - libsmbconf-devel 
   - libsmbios-devel 
-  - libsmbldap-devel 
   - libsmdev-devel 
   - libsmdev-tools 
   - libsmdev1 
@@ -14056,7 +14036,6 @@ unsorted:
   - libtesseract4 
   - libtestshade1_11: [x86_64] 
   - libtevent-devel 
-  - libtevent-util-devel 
   - libtexlua53-5 
   - libtexluajit2 
   - libtextstyle-devel 
@@ -14482,7 +14461,6 @@ unsorted:
   - libwayland-egl1-32bit: [x86_64] 
   - libwayland-server0-32bit: [x86_64] 
   - libwaylandpp0 
-  - libwbclient-devel 
   - libwbxml2-1 
   - libwbxml2-devel 
   - libwcs7 
@@ -23384,7 +23362,7 @@ unsorted:
   - python310-netpbmfile 
   - python310-networkx 
   - python310-nibabel 
-  - python310-nilearn: [i586] 
+  - python310-nilearn 
   - python310-nine 
   - python310-nltk 
   - python310-nocasedict 
@@ -23478,7 +23456,7 @@ unsorted:
   - python310-pan-python 
   - python310-pandas 
   - python310-pandas-datareader 
-  - python310-pandas-ext: [x86_64] 
+  - python310-pandas-ext 
   - python310-pandocfilters 
   - python310-panel 
   - python310-panflute 
@@ -24173,7 +24151,7 @@ unsorted:
   - python310-ruffus 
   - python310-runthis-sphinxext 
   - python310-rustcfg 
-  - python310-s3fs: [x86_64] 
+  - python310-s3fs 
   - python310-s3transfer 
   - python310-sadisplay 
   - python310-samplerate 
@@ -24773,7 +24751,6 @@ unsorted:
   - python36-requests-gssapi 
   - python36-rollbar 
   - python36-rss2email 
-  - python36-s3fs: [i586] 
   - python36-sgmllib3k 
   - python36-sphinx-argparse 
   - python36-starlette 
@@ -32248,11 +32225,13 @@ unsorted:
   - salt-syndic 
   - salt-zsh-completion 
   - samba-ad-dc 
-  - samba-ad-dc-32bit: [x86_64] 
+  - samba-ad-dc-libs-32bit: [x86_64] 
   - samba-ceph: [x86_64] 
-  - samba-core-devel 
+  - samba-devel 
+  - samba-devel-32bit: [x86_64] 
   - samba-dsdb-modules 
   - samba-krb-printing 
+  - samba-libs-32bit: [x86_64] 
   - samba-libs-python3-32bit: [x86_64] 
   - samba-test 
   - samba-tool