diff --git a/dvd.group b/dvd.group
index 08c3f686..c9edb5e9 100644
--- a/dvd.group
+++ b/dvd.group
@@ -403,7 +403,6 @@
     <package name="device-mapper" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="dhcp" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="dhcp-client" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="dhcp-doc" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="dhcp-relay" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-dhcp_dns_server -->
     <package name="dhcp-server" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-dhcp_dns_server -->
     <package name="dhcp-tools" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-dhcp_dns_server -->
@@ -428,7 +427,6 @@
     <package name="dmraid" supportstatus="unsupported"/> <!-- reason: dvd:grub2 -->
     <package name="dnsmasq" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="docbook-dsssl-stylesheets" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-technical_writing -->
-    <package name="docbook-tdg" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="docbook-xml-website" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-technical_writing -->
     <package name="docbook-xsl-stylesheets" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="docbook5-xsl-stylesheets" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-technical_writing -->
@@ -3325,7 +3323,6 @@
     <package name="nss_ldap" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
     <package name="ntfs-3g" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="ntfsprogs" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="ntp-doc" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="numlockx" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="nut" supportstatus="unsupported"/> <!-- reason: dvd:nut -->
     <package name="nut-cgi" supportstatus="unsupported"/> <!-- reason: dvd:nut-cgi -->
@@ -3427,7 +3424,6 @@
     <package name="patterns-base-transactional_base" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-transactional_base -->
     <package name="patterns-base-x11" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="patterns-base-x11_enhanced" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="patterns-desktop-books" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-books -->
     <package name="patterns-desktop-imaging" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="patterns-desktop-laptop" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-laptop -->
     <package name="patterns-desktop-multimedia" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -3929,15 +3925,12 @@
     <package name="popt-devel" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="posix_cc" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-C-C++-devel_C_C++ -->
     <package name="postfix" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_basis -->
-    <package name="postfix-doc" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="postgresql" supportstatus="unsupported"/> <!-- reason: dvd:postgresql -->
     <package name="postgresql-contrib" supportstatus="unsupported"/> <!-- reason: dvd:postgresql-contrib -->
-    <package name="postgresql-docs" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="postgresql-llvmjit" supportstatus="unsupported"/> <!-- reason: dvd:postgresql-contrib -->
     <package name="postgresql-server" supportstatus="unsupported"/> <!-- reason: dvd:postgresql-contrib -->
     <package name="postgresql12" supportstatus="unsupported"/> <!-- reason: dvd:postgresql -->
     <package name="postgresql12-contrib" supportstatus="unsupported"/> <!-- reason: dvd:postgresql-contrib -->
-    <package name="postgresql12-docs" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="postgresql12-llvmjit" supportstatus="unsupported"/> <!-- reason: dvd:postgresql-contrib -->
     <package name="postgresql12-server" supportstatus="unsupported"/> <!-- reason: dvd:postgresql-contrib -->
     <package name="pothana2000-fonts" supportstatus="unsupported"/> <!-- reason: dvd:indic-fonts -->
@@ -3992,7 +3985,6 @@
     <package name="python-gobject2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python-gtk" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python-ipaddress" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-osc-devel_osc_build -->
-    <package name="python-lxml-doc" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="python-qt5-utils" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="python-rpm-generators" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="python-rpm-macros" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -4809,7 +4801,6 @@
     <package name="salt-minion" supportstatus="unsupported"/> <!-- reason: dvd:salt-minion -->
     <package name="samba" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="samba-client" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="samba-doc" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <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-gnome-gnome -->
@@ -5415,7 +5406,6 @@
     <package name="xmlstarlet" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-technical_writing -->
     <package name="xmlto" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-technical_writing -->
     <package name="xmodmap" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="xorg-docs" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="xorg-x11-Xvnc" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="xorg-x11-Xvnc-module" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="xorg-x11-driver-video" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -5573,8 +5563,6 @@
     <package name="yast2-trans-sr" supportstatus="unsupported"/> <!-- reason: dvd:yast2-trans-sr -->
     <package name="yast2-trans-stats" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="yast2-trans-sv" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="yast2-trans-ta" supportstatus="unsupported"/> <!-- reason: dvd:yast2-trans-ta -->
-    <package name="yast2-trans-th" supportstatus="unsupported"/> <!-- reason: dvd:yast2-trans-th -->
     <package name="yast2-trans-tr" supportstatus="unsupported"/> <!-- reason: dvd:yast2-trans-tr -->
     <package name="yast2-trans-uk" supportstatus="unsupported"/> <!-- reason: dvd:yast2-trans-uk -->
     <package name="yast2-trans-vi" supportstatus="unsupported"/> <!-- reason: dvd:yast2-trans-vi -->
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index fd05d01e..5386cefa 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -403,7 +403,6 @@
       <repopackage name="device-mapper"/>
       <repopackage name="dhcp"/>
       <repopackage name="dhcp-client"/>
-      <repopackage name="dhcp-doc"/>
       <repopackage name="dhcp-relay"/>
       <repopackage name="dhcp-server"/>
       <repopackage name="dhcp-tools"/>
@@ -428,7 +427,6 @@
       <repopackage name="dmraid"/>
       <repopackage name="dnsmasq"/>
       <repopackage name="docbook-dsssl-stylesheets"/>
-      <repopackage name="docbook-tdg"/>
       <repopackage name="docbook-xml-website"/>
       <repopackage name="docbook-xsl-stylesheets"/>
       <repopackage name="docbook5-xsl-stylesheets"/>
@@ -3370,7 +3368,6 @@
       <repopackage name="nss_ldap"/>
       <repopackage name="ntfs-3g"/>
       <repopackage name="ntfsprogs"/>
-      <repopackage name="ntp-doc"/>
       <repopackage name="numlockx"/>
       <repopackage name="nut"/>
       <repopackage name="nut-cgi"/>
@@ -3481,7 +3478,6 @@
       <repopackage name="patterns-base-transactional_base"/>
       <repopackage name="patterns-base-x11"/>
       <repopackage name="patterns-base-x11_enhanced"/>
-      <repopackage name="patterns-desktop-books"/>
       <repopackage name="patterns-desktop-imaging"/>
       <repopackage name="patterns-desktop-laptop"/>
       <repopackage name="patterns-desktop-multimedia"/>
@@ -3982,15 +3978,12 @@
       <repopackage name="popt-devel"/>
       <repopackage name="posix_cc"/>
       <repopackage name="postfix"/>
-      <repopackage name="postfix-doc"/>
       <repopackage name="postgresql"/>
       <repopackage name="postgresql-contrib"/>
-      <repopackage name="postgresql-docs"/>
       <repopackage name="postgresql-llvmjit"/>
       <repopackage name="postgresql-server"/>
       <repopackage name="postgresql12"/>
       <repopackage name="postgresql12-contrib"/>
-      <repopackage name="postgresql12-docs"/>
       <repopackage name="postgresql12-llvmjit"/>
       <repopackage name="postgresql12-server"/>
       <repopackage name="pothana2000-fonts"/>
@@ -4044,7 +4037,6 @@
       <repopackage name="python-gobject2"/>
       <repopackage name="python-gtk"/>
       <repopackage name="python-ipaddress"/>
-      <repopackage name="python-lxml-doc"/>
       <repopackage name="python-qt5-utils"/>
       <repopackage name="python-rpm-generators"/>
       <repopackage name="python-rpm-macros"/>
@@ -4863,7 +4855,6 @@
       <repopackage name="salt-minion"/>
       <repopackage name="samba"/>
       <repopackage name="samba-client"/>
-      <repopackage name="samba-doc"/>
       <repopackage name="samba-libs"/>
       <repopackage name="samba-libs-python3"/>
       <repopackage name="samba-python3"/>
@@ -5469,7 +5460,6 @@
       <repopackage name="xmlstarlet"/>
       <repopackage name="xmlto"/>
       <repopackage name="xmodmap"/>
-      <repopackage name="xorg-docs"/>
       <repopackage name="xorg-x11-driver-video"/>
       <repopackage name="xorg-x11-essentials"/>
       <repopackage name="xorg-x11-fonts"/>
@@ -5627,8 +5617,6 @@
       <repopackage name="yast2-trans-sr"/>
       <repopackage name="yast2-trans-stats"/>
       <repopackage name="yast2-trans-sv"/>
-      <repopackage name="yast2-trans-ta"/>
-      <repopackage name="yast2-trans-th"/>
       <repopackage name="yast2-trans-tr"/>
       <repopackage name="yast2-trans-uk"/>
       <repopackage name="yast2-trans-vi"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index be908de4..84349503 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -415,7 +415,6 @@
       <repopackage name="device-mapper"/>
       <repopackage name="dhcp"/>
       <repopackage name="dhcp-client"/>
-      <repopackage name="dhcp-doc"/>
       <repopackage name="dhcp-relay"/>
       <repopackage name="dhcp-server"/>
       <repopackage name="dhcp-tools"/>
@@ -440,7 +439,6 @@
       <repopackage name="dmraid"/>
       <repopackage name="dnsmasq"/>
       <repopackage name="docbook-dsssl-stylesheets"/>
-      <repopackage name="docbook-tdg"/>
       <repopackage name="docbook-xml-website"/>
       <repopackage name="docbook-xsl-stylesheets"/>
       <repopackage name="docbook5-xsl-stylesheets"/>
@@ -3563,7 +3561,6 @@
       <repopackage name="nss_ldap-32bit" arch="x86_64"/>
       <repopackage name="ntfs-3g"/>
       <repopackage name="ntfsprogs"/>
-      <repopackage name="ntp-doc"/>
       <repopackage name="numactl" arch="x86_64"/>
       <repopackage name="numad" arch="x86_64"/>
       <repopackage name="numlockx"/>
@@ -3681,7 +3678,6 @@
       <repopackage name="patterns-base-transactional_base"/>
       <repopackage name="patterns-base-x11"/>
       <repopackage name="patterns-base-x11_enhanced"/>
-      <repopackage name="patterns-desktop-books"/>
       <repopackage name="patterns-desktop-imaging"/>
       <repopackage name="patterns-desktop-laptop"/>
       <repopackage name="patterns-desktop-multimedia"/>
@@ -4190,15 +4186,12 @@
       <repopackage name="popt-devel"/>
       <repopackage name="posix_cc"/>
       <repopackage name="postfix"/>
-      <repopackage name="postfix-doc"/>
       <repopackage name="postgresql"/>
       <repopackage name="postgresql-contrib"/>
-      <repopackage name="postgresql-docs"/>
       <repopackage name="postgresql-llvmjit"/>
       <repopackage name="postgresql-server"/>
       <repopackage name="postgresql12"/>
       <repopackage name="postgresql12-contrib"/>
-      <repopackage name="postgresql12-docs"/>
       <repopackage name="postgresql12-llvmjit"/>
       <repopackage name="postgresql12-server"/>
       <repopackage name="pothana2000-fonts"/>
@@ -4252,7 +4245,6 @@
       <repopackage name="python-gobject2"/>
       <repopackage name="python-gtk"/>
       <repopackage name="python-ipaddress"/>
-      <repopackage name="python-lxml-doc"/>
       <repopackage name="python-qt5-utils"/>
       <repopackage name="python-rpm-generators"/>
       <repopackage name="python-rpm-macros"/>
@@ -5091,7 +5083,6 @@
       <repopackage name="samba"/>
       <repopackage name="samba-client"/>
       <repopackage name="samba-client-32bit" arch="x86_64"/>
-      <repopackage name="samba-doc"/>
       <repopackage name="samba-libs"/>
       <repopackage name="samba-libs-32bit" arch="x86_64"/>
       <repopackage name="samba-libs-python3"/>
@@ -5713,7 +5704,6 @@
       <repopackage name="xmlstarlet"/>
       <repopackage name="xmlto"/>
       <repopackage name="xmodmap"/>
-      <repopackage name="xorg-docs"/>
       <repopackage name="xorg-x11-driver-video"/>
       <repopackage name="xorg-x11-essentials"/>
       <repopackage name="xorg-x11-fonts"/>
@@ -5872,8 +5862,6 @@
       <repopackage name="yast2-trans-sr"/>
       <repopackage name="yast2-trans-stats"/>
       <repopackage name="yast2-trans-sv"/>
-      <repopackage name="yast2-trans-ta"/>
-      <repopackage name="yast2-trans-th"/>
       <repopackage name="yast2-trans-tr"/>
       <repopackage name="yast2-trans-uk"/>
       <repopackage name="yast2-trans-vi"/>
diff --git a/unsorted.yml b/unsorted.yml
index bf9a1711..84e171b2 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -2292,6 +2292,7 @@ unsorted:
   - dh-autoreconf 
   - dh-make 
   - dhcp-devel 
+  - dhcp-doc 
   - dhewm3 
   - dhex 
   - dhtest 
@@ -2371,6 +2372,7 @@ unsorted:
   - dnstracer 
   - docbook-css-stylesheets 
   - docbook-simple 
+  - docbook-tdg 
   - docbook-toys 
   - docbook-utils 
   - docbook-utils-minimal 
@@ -14731,6 +14733,7 @@ unsorted:
   - ntl-devel 
   - ntl-doc 
   - ntp 
+  - ntp-doc 
   - ntpsec 
   - ntpsec-doc 
   - ntpsec-utils 
@@ -15690,6 +15693,7 @@ unsorted:
   - patterns-base-x11-32bit 
   - patterns-base-x11_enhanced-32bit 
   - patterns-ceph-containers-ceph_base: [x86_64] 
+  - patterns-desktop-books 
   - patterns-devel-base-devel_basis-32bit 
   - patterns-devel-base-devel_kernel-32bit 
   - patterns-devel-java-devel_java 
@@ -17242,11 +17246,13 @@ unsorted:
   - poster 
   - postfish 
   - postfix-devel 
+  - postfix-doc 
   - postfix-lmdb 
   - postfix-mysql 
   - postfix-postgresql 
   - postfixadmin 
   - postgresql-devel 
+  - postgresql-docs 
   - postgresql-plperl 
   - postgresql-plpython 
   - postgresql-pltcl 
@@ -17284,6 +17290,7 @@ unsorted:
   - postgresql11-test 
   - postgresql11-timescaledb 
   - postgresql12-devel 
+  - postgresql12-docs 
   - postgresql12-plperl 
   - postgresql12-plpython 
   - postgresql12-pltcl 
@@ -17690,6 +17697,7 @@ unsorted:
   - python-libteam 
   - python-lmiwbem 
   - python-logutils-doc 
+  - python-lxml-doc 
   - python-magnumclient-doc 
   - python-manilaclient-doc 
   - python-marisa 
@@ -24028,6 +24036,7 @@ unsorted:
   - samba-ad-dc-32bit: [x86_64] 
   - samba-ceph: [x86_64] 
   - samba-core-devel 
+  - samba-doc 
   - samba-dsdb-modules 
   - samba-krb-printing 
   - samba-libs-python3-32bit: [x86_64] 
@@ -33727,6 +33736,7 @@ unsorted:
   - xonsh 
   - xonsh-doc 
   - xorg-cf-files 
+  - xorg-docs 
   - xorg-scripts 
   - xorg-sgml-doctools 
   - xorg-x11 
@@ -33925,7 +33935,9 @@ unsorted:
   - yast2-trans-sq 
   - yast2-trans-sr-latin 
   - yast2-trans-sw 
+  - yast2-trans-ta 
   - yast2-trans-tg 
+  - yast2-trans-th 
   - yast2-trans-tk 
   - yast2-update-FACTORY 
   - yast2-usbauth