diff --git a/MicroOS-dvd5-dvd-x86_64.kiwi b/MicroOS-dvd5-dvd-x86_64.kiwi
index 0f4f8bc9..fb39ff21 100644
--- a/MicroOS-dvd5-dvd-x86_64.kiwi
+++ b/MicroOS-dvd5-dvd-x86_64.kiwi
@@ -1495,10 +1495,10 @@
       <repopackage name="libpolkit-agent-1-0"/>
       <repopackage name="libpolkit-gobject-1-0"/>
       <repopackage name="libpolkit-qt5-1-1" arch="x86_64"/>
-      <repopackage name="libpoppler-cpp0" arch="x86_64"/>
+      <repopackage name="libpoppler-cpp0"/>
       <repopackage name="libpoppler-glib8" arch="x86_64"/>
       <repopackage name="libpoppler-qt5-1" arch="x86_64"/>
-      <repopackage name="libpoppler124" arch="x86_64"/>
+      <repopackage name="libpoppler124"/>
       <repopackage name="libpopt0"/>
       <repopackage name="libportal-1" arch="x86_64"/>
       <repopackage name="libportal-gtk3-1" arch="x86_64"/>
@@ -1590,8 +1590,8 @@
       <repopackage name="libreoffice-branding-openSUSE" arch="x86_64"/>
       <repopackage name="libreoffice-branding-upstream"/>
       <repopackage name="libreoffice-calc"/>
-      <repopackage name="libreoffice-draw" arch="x86_64"/>
-      <repopackage name="libreoffice-filters-optional" arch="x86_64"/>
+      <repopackage name="libreoffice-draw"/>
+      <repopackage name="libreoffice-filters-optional"/>
       <repopackage name="libreoffice-gnome"/>
       <repopackage name="libreoffice-gtk3" arch="x86_64"/>
       <repopackage name="libreoffice-icon-themes"/>
@@ -2234,7 +2234,7 @@
       <repopackage name="polkit-gnome-lang" arch="x86_64"/>
       <repopackage name="polkit-kde-agent-5" arch="x86_64"/>
       <repopackage name="polkit-kde-agent-5-lang" arch="x86_64"/>
-      <repopackage name="poppler-data" arch="x86_64"/>
+      <repopackage name="poppler-data"/>
       <repopackage name="poppler-tools" arch="x86_64"/>
       <repopackage name="popt-lang"/>
       <repopackage name="postfix" arch="x86_64"/>
diff --git a/dvd.group b/dvd.group
index 9682d2c5..36dbc4e2 100644
--- a/dvd.group
+++ b/dvd.group
@@ -2506,6 +2506,8 @@
     <package name="libreoffice-base" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="libreoffice-branding-openSUSE" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="libreoffice-calc" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
+    <package name="libreoffice-draw" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
+    <package name="libreoffice-filters-optional" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="libreoffice-gnome" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="libreoffice-gtk3" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libreoffice-icon-themes" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
@@ -5029,8 +5031,6 @@
     <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="libreoffice-draw" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
-    <package name="libreoffice-filters-optional" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="libsasl2-3-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libselinux1-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libspf2-2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index 254335b8..040574c8 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -2463,6 +2463,8 @@
       <repopackage name="libreoffice-base"/>
       <repopackage name="libreoffice-branding-openSUSE"/>
       <repopackage name="libreoffice-calc"/>
+      <repopackage name="libreoffice-draw"/>
+      <repopackage name="libreoffice-filters-optional"/>
       <repopackage name="libreoffice-gnome"/>
       <repopackage name="libreoffice-gtk3"/>
       <repopackage name="libreoffice-icon-themes"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index 450c7b82..34364bca 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -2611,8 +2611,8 @@
       <repopackage name="libreoffice-base"/>
       <repopackage name="libreoffice-branding-openSUSE"/>
       <repopackage name="libreoffice-calc"/>
-      <repopackage name="libreoffice-draw" arch="x86_64"/>
-      <repopackage name="libreoffice-filters-optional" arch="x86_64"/>
+      <repopackage name="libreoffice-draw"/>
+      <repopackage name="libreoffice-filters-optional"/>
       <repopackage name="libreoffice-gnome"/>
       <repopackage name="libreoffice-gtk3"/>
       <repopackage name="libreoffice-icon-themes"/>
diff --git a/opensuse_microos.group b/opensuse_microos.group
index 1ad05601..a27b946f 100644
--- a/opensuse_microos.group
+++ b/opensuse_microos.group
@@ -684,6 +684,8 @@
     <package name="libpng16-16" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="libpolkit-agent-1-0" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="libpolkit-gobject-1-0" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
+    <package name="libpoppler-cpp0" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
+    <package name="libpoppler124" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="libpopt0" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="libportaudio2" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-base -->
     <package name="libpresage1" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
@@ -715,6 +717,8 @@
     <package name="libreoffice-base" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="libreoffice-branding-upstream" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="libreoffice-calc" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
+    <package name="libreoffice-draw" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
+    <package name="libreoffice-filters-optional" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="libreoffice-gnome" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="libreoffice-icon-themes" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="libreoffice-impress" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
@@ -968,6 +972,7 @@
     <package name="pkgconf-pkg-config" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="polkit" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="polkit-default-privs" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
+    <package name="poppler-data" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="popt-lang" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="presage-data" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="publicsuffix" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
@@ -1929,10 +1934,8 @@
     <package name="libply-splash-graphics5" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="libply5" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="libpolkit-qt5-1-1" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
-    <package name="libpoppler-cpp0" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="libpoppler-glib8" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-gnome -->
     <package name="libpoppler-qt5-1" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
-    <package name="libpoppler124" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="libportal-1" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-gnome -->
     <package name="libportal-gtk3-1" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-gnome -->
     <package name="libportal-gtk4-1" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-gnome -->
@@ -1964,8 +1967,6 @@
     <package name="libraw20" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="libref_array1" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-sssd_ldap -->
     <package name="libreoffice-branding-openSUSE" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-base -->
-    <package name="libreoffice-draw" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
-    <package name="libreoffice-filters-optional" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="libreoffice-gtk3" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-gnome -->
     <package name="libreoffice-qt5" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="libreofficekit" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-gnome -->
@@ -2283,7 +2284,6 @@
     <package name="polkit-gnome-lang" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-gnome -->
     <package name="polkit-kde-agent-5" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="polkit-kde-agent-5-lang" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
-    <package name="poppler-data" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="poppler-tools" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="postfix" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="power-profiles-daemon" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
diff --git a/unsorted.yml b/unsorted.yml
index f32a1588..ba44af3c 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -10280,10 +10280,10 @@ unsorted:
   - libcelt-devel-32bit: [x86_64] 
   - libcelt0-2-32bit: [x86_64] 
   - libcelt051-0 
-  - libcephfs-devel: [x86_64] # devel package of dvd:librbd1 
+  - libcephfs-devel: [x86_64] # devel package of dvd:librados2 
   - libcephfs2: [x86_64] 
   - libcephsqlite: [x86_64] 
-  - libcephsqlite-devel: [x86_64] # devel package of dvd:librbd1 
+  - libcephsqlite-devel: [x86_64] # devel package of dvd:librados2 
   - libceres-devel 
   - libceres2 
   - libcerf-devel 
@@ -13583,8 +13583,8 @@ unsorted:
   - librabbitmq-devel 
   - librabbitmq4 
   - libradcli5 
-  - librados-devel: [x86_64] # devel package of dvd:librbd1 
-  - libradospp-devel: [x86_64] # devel package of dvd:librbd1 
+  - librados-devel: [x86_64] # devel package of dvd:librados2 
+  - libradospp-devel: [x86_64] # devel package of dvd:librados2 
   - libraft2 
   - libraptor-devel 
   - libraptor2-0-32bit: [x86_64] 
@@ -13607,7 +13607,7 @@ unsorted:
   - libraw1394-tools 
   - libraw20-32bit: [x86_64] 
   - libraylib400 
-  - librbd-devel: [x86_64] # devel package of dvd:librbd1 
+  - librbd-devel: [x86_64] # devel package of dvd:librados2 
   - librbio2 
   - librbl1 
   - librcc-devel 
@@ -13658,8 +13658,6 @@ unsorted:
   - librem3 
   - libreoffice-base-drivers-postgresql 
   - libreoffice-calc-extensions 
-  - libreoffice-draw: [i586] 
-  - libreoffice-filters-optional: [i586] 
   - libreoffice-gdb-pretty-printers 
   - libreoffice-glade 
   - libreoffice-l10n-af 
@@ -13795,7 +13793,7 @@ unsorted:
   - librevenge-doc 
   - librevenge-generators-0_0-0 
   - librfxencode0 
-  - librgw-devel: [x86_64] # devel package of dvd:librbd1 
+  - librgw-devel: [x86_64] # devel package of dvd:librados2 
   - librgw2: [x86_64] 
   - librhash0 
   - librime-devel 
@@ -21082,7 +21080,6 @@ unsorted:
   - pommed 
   - pongix 
   - popeye 
-  - poppler-data: [i586] 
   - poppler-data-devel 
   - popt-devel 
   - popt-devel-32bit: [x86_64] 
@@ -32498,7 +32495,7 @@ unsorted:
   - radcli-devel 
   - radeontop 
   - radeontop-lang 
-  - rados-objclass-devel: [x86_64] # devel package of dvd:librbd1 
+  - rados-objclass-devel: [x86_64] # devel package of dvd:librados2 
   - raft-devel 
   - rage 
   - rage-encryption: [x86_64]