diff --git a/dvd.group b/dvd.group
index 32830f09..5872a2f8 100644
--- a/dvd.group
+++ b/dvd.group
@@ -3414,6 +3414,9 @@
     <package name="openSUSE-release" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="openSUSE-release-dvd" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="openSUSE-xfce-icon-theme" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
+    <package name="openafs" supportstatus="unsupported"/> <!-- reason: dvd:openafs-client -->
+    <package name="openafs-client" supportstatus="unsupported"/> <!-- reason: dvd:openafs-client -->
+    <package name="openafs-kmp-default" supportstatus="unsupported"/> <!-- reason: dvd:openafs-client -->
     <package name="openal-soft" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="openbox" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
     <package name="openbox-adwaita-ob-theme" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
@@ -5151,6 +5154,9 @@
     <package name="virt-install" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
     <package name="virt-manager-common" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
     <package name="virt-what" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="virtualbox-guest-kmp-default" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+    <package name="virtualbox-guest-tools" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+    <package name="virtualbox-guest-x11" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="vlan" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="vlc" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="vlc-codec-gstreamer" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
@@ -5591,9 +5597,6 @@
   <packagelist relationship="recommends">
     <package name="elinks" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libpng12-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <!-- openafs-client uninstallable: nothing provides kernel-uname-r = 4.20.12-1-default needed by openafs-kmp-default-1.8.2_k4.20.12_1-3.6.i586-->
-    <!-- virtualbox-guest-tools uninstallable: nothing provides kernel-uname-r = 4.20.12-1-default needed by virtualbox-guest-kmp-default-6.0.4_k4.20.12_1-1.2.i586-->
-    <!-- virtualbox-guest-x11 uninstallable: nothing provides kernel-uname-r = 4.20.12-1-default needed by virtualbox-guest-kmp-default-6.0.4_k4.20.12_1-1.2.i586-->
   </packagelist>
 </group>
 <group name="dvd.x86_64">
@@ -5811,7 +5814,6 @@
     <package name="nss_ldap-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="numactl" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="numad" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
-    <!-- openafs-client uninstallable: nothing provides kernel-uname-r = 4.20.12-1-default needed by openafs-kmp-default-1.8.2_k4.20.12_1-3.6.x86_64-->
     <package name="opie-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="pam-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="pam_apparmor-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -5856,8 +5858,6 @@
     <package name="supermin" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="systemd-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="virt-sandbox" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <!-- virtualbox-guest-tools uninstallable: nothing provides kernel-uname-r = 4.20.12-1-default needed by virtualbox-guest-kmp-default-6.0.4_k4.20.12_1-1.2.x86_64-->
-    <!-- virtualbox-guest-x11 uninstallable: nothing provides kernel-uname-r = 4.20.12-1-default needed by virtualbox-guest-kmp-default-6.0.4_k4.20.12_1-1.2.x86_64-->
     <package name="xen" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-xen_server -->
     <package name="xen-tools" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-xen_server -->
     <package name="yast2-drbd" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index 82b65c43..ec8559ff 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -3453,6 +3453,9 @@
       <repopackage name="open-iscsi"/>
       <repopackage name="open-vm-tools"/>
       <repopackage name="open-vm-tools-desktop"/>
+      <repopackage name="openafs"/>
+      <repopackage name="openafs-client"/>
+      <repopackage name="openafs-kmp-default"/>
       <repopackage name="openal-soft"/>
       <repopackage name="openbox"/>
       <repopackage name="openbox-adwaita-ob-theme"/>
@@ -5202,6 +5205,9 @@
       <repopackage name="virt-install"/>
       <repopackage name="virt-manager-common"/>
       <repopackage name="virt-what"/>
+      <repopackage name="virtualbox-guest-kmp-default"/>
+      <repopackage name="virtualbox-guest-tools"/>
+      <repopackage name="virtualbox-guest-x11"/>
       <repopackage name="vlan"/>
       <repopackage name="vlc"/>
       <repopackage name="vlc-codec-gstreamer"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index 5a9a0954..c790f04d 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -3662,6 +3662,9 @@
       <repopackage name="open-iscsi"/>
       <repopackage name="open-vm-tools"/>
       <repopackage name="open-vm-tools-desktop"/>
+      <repopackage name="openafs"/>
+      <repopackage name="openafs-client"/>
+      <repopackage name="openafs-kmp-default"/>
       <repopackage name="openal-soft"/>
       <repopackage name="openbox"/>
       <repopackage name="openbox-adwaita-ob-theme"/>
@@ -5455,6 +5458,9 @@
       <repopackage name="virt-manager-common"/>
       <repopackage name="virt-sandbox" arch="x86_64"/>
       <repopackage name="virt-what"/>
+      <repopackage name="virtualbox-guest-kmp-default"/>
+      <repopackage name="virtualbox-guest-tools"/>
+      <repopackage name="virtualbox-guest-x11"/>
       <repopackage name="vlan"/>
       <repopackage name="vlc"/>
       <repopackage name="vlc-codec-gstreamer"/>
diff --git a/unsorted.yml b/unsorted.yml
index 8f5df897..231417e2 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -13769,14 +13769,11 @@ unsorted:
   - openSUSE-release-usb-gnome 
   - openSUSE-release-usb-kde 
   - openSUSE-release-usb-x11 
-  - openafs 
   - openafs-authlibs 
   - openafs-authlibs-devel 
-  - openafs-client 
   - openafs-devel 
   - openafs-fuse_client 
   - openafs-kernel-source 
-  - openafs-kmp-default 
   - openafs-server 
   - openal-soft-devel 
   - openal-soft-devel-32bit: [x86_64] 
@@ -30277,10 +30274,7 @@ unsorted:
   - virtualbox 
   - virtualbox-devel 
   - virtualbox-guest-desktop-icons 
-  - virtualbox-guest-kmp-default 
   - virtualbox-guest-source 
-  - virtualbox-guest-tools 
-  - virtualbox-guest-x11 
   - virtualbox-host-kmp-default 
   - virtualbox-host-source 
   - virtualbox-qt