diff --git a/dvd.group b/dvd.group
index bb69dc13..800daec1 100644
--- a/dvd.group
+++ b/dvd.group
@@ -485,7 +485,7 @@
     <package name="eog-plugins" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="eog-plugins-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="epiphany" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="epiphany-branding-upstream" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="epiphany-branding-openSUSE" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="epiphany-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="epson-inkjet-printer-escpr" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-printing -->
     <package name="erofs-utils" supportstatus="unsupported"/> <!-- reason: dvd:erofs-utils -->
@@ -1220,7 +1220,6 @@
     <package name="kdoctools-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="kdump" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
     <package name="kernel-default" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="kernel-default-base" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="kernel-default-devel" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-base-devel_kernel -->
     <package name="kernel-devel" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-base-devel_kernel -->
     <package name="kernel-docs" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -3148,8 +3147,6 @@
     <package name="lsof" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="lsscsi" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="ltrace" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-C-C++-devel_C_C++ -->
-    <package name="lttng-modules" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="lttng-modules-kmp-default" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="lua53" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="lua53-luasocket" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="luit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index 1e154130..5bf90f54 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -487,7 +487,7 @@
       <repopackage name="eog-plugins"/>
       <repopackage name="eog-plugins-lang"/>
       <repopackage name="epiphany"/>
-      <repopackage name="epiphany-branding-upstream"/>
+      <repopackage name="epiphany-branding-openSUSE"/>
       <repopackage name="epiphany-lang"/>
       <repopackage name="epson-inkjet-printer-escpr"/>
       <repopackage name="erofs-utils"/>
@@ -1228,7 +1228,6 @@
       <repopackage name="kdoctools-lang"/>
       <repopackage name="kdump"/>
       <repopackage name="kernel-default"/>
-      <repopackage name="kernel-default-base"/>
       <repopackage name="kernel-default-devel"/>
       <repopackage name="kernel-devel"/>
       <repopackage name="kernel-docs"/>
@@ -3158,8 +3157,6 @@
       <repopackage name="lsof"/>
       <repopackage name="lsscsi"/>
       <repopackage name="ltrace"/>
-      <repopackage name="lttng-modules"/>
-      <repopackage name="lttng-modules-kmp-default"/>
       <repopackage name="lua53"/>
       <repopackage name="lua53-luasocket"/>
       <repopackage name="luit"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index 82f2ea1c..c675fcd3 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -503,7 +503,7 @@
       <repopackage name="eog-plugins"/>
       <repopackage name="eog-plugins-lang"/>
       <repopackage name="epiphany"/>
-      <repopackage name="epiphany-branding-upstream"/>
+      <repopackage name="epiphany-branding-openSUSE"/>
       <repopackage name="epiphany-lang"/>
       <repopackage name="epson-inkjet-printer-escpr"/>
       <repopackage name="erofs-utils"/>
@@ -1258,7 +1258,6 @@
       <repopackage name="kdoctools-lang"/>
       <repopackage name="kdump"/>
       <repopackage name="kernel-default"/>
-      <repopackage name="kernel-default-base"/>
       <repopackage name="kernel-default-devel"/>
       <repopackage name="kernel-devel"/>
       <repopackage name="kernel-docs"/>
@@ -3344,8 +3343,6 @@
       <repopackage name="lsof"/>
       <repopackage name="lsscsi"/>
       <repopackage name="ltrace"/>
-      <repopackage name="lttng-modules"/>
-      <repopackage name="lttng-modules-kmp-default"/>
       <repopackage name="lua53"/>
       <repopackage name="lua53-luasocket"/>
       <repopackage name="luit"/>
diff --git a/unsorted.yml b/unsorted.yml
index 9c39fe16..eacdabaa 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -2718,7 +2718,7 @@ unsorted:
   - ephoto 
   - ephoto-lang 
   - epic 
-  - epiphany-branding-openSUSE 
+  - epiphany-branding-upstream 
   - epour 
   - epour-lang 
   - epplet-base 
@@ -6396,6 +6396,7 @@ unsorted:
   - kernel-coverage 
   - kernel-debug 
   - kernel-debug-devel 
+  - kernel-default-base: [i586] 
   - kernel-default-base-rebuild 
   - kernel-docs-html 
   - kernel-firmware 
@@ -12746,6 +12747,8 @@ unsorted:
   - lswm 
   - lsyncd 
   - ltrace-32bit: [x86_64] 
+  - lttng-modules 
+  - lttng-modules-kmp-default 
   - lttng-modules-kmp-pae: [i586] 
   - lttng-ust-devel 
   - lttng-ust-doc