diff --git a/dvd.group b/dvd.group
index eaa46b6a..febc6e4d 100644
--- a/dvd.group
+++ b/dvd.group
@@ -179,6 +179,7 @@
     <package name="at-spi2-atk-gtk2" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="at-spi2-core" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="at-spi2-core-lang" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
+    <package name="atftp" supportstatus="unsupported"/> <!-- reason: dvd:atftp -->
     <package name="atk-lang" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="atmel-firmware" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="attica-qt5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
@@ -5677,7 +5678,6 @@
     <package name="guestfs-data" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="ibus-gtk-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="kernel-syms" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-base-devel_kernel -->
-    <package name="kernel-vanilla" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-osc-devel_osc_build -->
     <package name="kmozillahelper" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="krb5-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="ldmtool" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
diff --git a/openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi b/openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi
index a5159476..602434e2 100644
--- a/openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi
+++ b/openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi
@@ -434,15 +434,12 @@
       <repopackage name="openSUSE-build-key" arch="x86_64"/>
       <repopackage name="openSUSE-MicroOS-release"/>
       <repopackage name="openSUSE-MicroOS-release-appliance"/>
-      <repopackage name="openSUSE-release" arch="x86_64"/>
-      <repopackage name="openSUSE-release-appliance" arch="x86_64"/>
       <repopackage name="p11-kit" arch="x86_64"/>
       <repopackage name="p11-kit-tools" arch="x86_64"/>
       <repopackage name="pam"/>
       <repopackage name="pam-config"/>
       <repopackage name="parted" arch="x86_64"/>
       <repopackage name="patterns-base-apparmor" arch="x86_64"/>
-      <repopackage name="patterns-base-basesystem" arch="x86_64"/>
       <repopackage name="patterns-base-minimal_base" arch="x86_64"/>
       <repopackage name="patterns-containers-container_runtime" arch="x86_64"/>
       <repopackage name="patterns-containers-container_runtime_kubernetes" arch="x86_64"/>
@@ -584,7 +581,6 @@
       <repopackage name="systemd"/>
       <repopackage name="systemd-logger" arch="x86_64"/>
       <repopackage name="systemd-presets-branding-MicroOS"/>
-      <repopackage name="systemd-presets-branding-openSUSE" arch="x86_64"/>
       <repopackage name="systemd-presets-common-SUSE"/>
       <repopackage name="systemd-sysvinit"/>
       <repopackage name="sysuser-shadow"/>
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index b32fc5a1..301ca6d0 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -178,6 +178,7 @@
       <repopackage name="at-spi2-atk-gtk2"/>
       <repopackage name="at-spi2-core"/>
       <repopackage name="at-spi2-core-lang"/>
+      <repopackage name="atftp"/>
       <repopackage name="atk-lang"/>
       <repopackage name="atmel-firmware"/>
       <repopackage name="attica-qt5"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index 7a5a82b3..f784a1f4 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -186,6 +186,7 @@
       <repopackage name="at-spi2-atk-gtk2"/>
       <repopackage name="at-spi2-core"/>
       <repopackage name="at-spi2-core-lang"/>
+      <repopackage name="atftp"/>
       <repopackage name="atk-lang"/>
       <repopackage name="atmel-firmware"/>
       <repopackage name="attica-qt5"/>
@@ -1294,7 +1295,6 @@
       <repopackage name="kernel-macros"/>
       <repopackage name="kernel-source"/>
       <repopackage name="kernel-syms" arch="x86_64"/>
-      <repopackage name="kernel-vanilla" arch="x86_64"/>
       <repopackage name="kexec-tools"/>
       <repopackage name="keyutils"/>
       <repopackage name="kf5-kcm-fcitx"/>
diff --git a/opensuse_kubic.group b/opensuse_kubic.group
index 85fa03fe..f9ce1159 100644
--- a/opensuse_kubic.group
+++ b/opensuse_kubic.group
@@ -8,7 +8,7 @@
     <package name="coreutils" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="cpio" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="cracklib" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
-    <package name="cracklib-dict-full" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-container_runtime_kubernetes -->
+    <package name="cracklib-dict-full" supportstatus="unsupported"/> <!-- reason: opensuse_microos:kernel-default -->
     <package name="dbus-1" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="diffutils" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="dracut" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
@@ -415,8 +415,6 @@
     <package name="open-lldp" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="open-vm-tools" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-onlyDVD -->
     <package name="openSUSE-build-key" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
-    <package name="openSUSE-release" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-container_runtime_kubernetes -->
-    <package name="openSUSE-release-appliance" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-container_runtime_kubernetes -->
     <package name="openssh" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="openssl" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="openssl-1_1" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
@@ -424,7 +422,6 @@
     <package name="p11-kit-tools" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="parted" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="patterns-base-apparmor" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
-    <package name="patterns-base-basesystem" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-container_runtime_kubernetes -->
     <package name="patterns-base-minimal_base" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="patterns-containers-container_runtime" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-container_runtime -->
     <package name="patterns-containers-container_runtime_kubernetes" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-container_runtime_kubernetes -->
@@ -549,7 +546,6 @@
     <package name="system-user-daemon" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="system-user-nobody" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="systemd-logger" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-defaults -->
-    <package name="systemd-presets-branding-openSUSE" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-container_runtime_kubernetes -->
     <package name="tallow" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="tar" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="terminfo" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
diff --git a/unsorted.yml b/unsorted.yml
index 067a13b3..c2babefe 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -768,7 +768,6 @@ unsorted:
   - at-spi2-atk-devel 
   - at-spi2-core-devel 
   - at-spi2-core-devel-32bit: [x86_64] 
-  - atftp 
   - atheme 
   - atheme-devel 
   - atinject 
@@ -6066,7 +6065,7 @@ unsorted:
   - kernel-pae-devel: [i586] 
   - kernel-source-vanilla 
   - kernel-syms: [i586] 
-  - kernel-vanilla: [i586] 
+  - kernel-vanilla 
   - kernel-vanilla-devel 
   - ketchup 
   - kexi 
@@ -14513,7 +14512,7 @@ unsorted:
   - openSUSE-appdata-extra 
   - openSUSE-appstream-process 
   - openSUSE-driverupdate 
-  - openSUSE-release-appliance: [i586] 
+  - openSUSE-release-appliance 
   - openSUSE-release-appliance-docker 
   - openSUSE-release-appliance-hyperv 
   - openSUSE-release-appliance-kvm