diff --git a/dvd.group b/dvd.group
index 2b6042a7..70cd53e3 100644
--- a/dvd.group
+++ b/dvd.group
@@ -302,6 +302,7 @@
     <package name="enchant-2-backend-hunspell" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="enchant-data" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="epiphany" 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 -->
@@ -3946,7 +3947,6 @@
   <conditional name="only_i586"/>
   <packagelist relationship="recommends">
     <package name="elinks" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_basis_opt -->
-    <package name="epiphany-branding-upstream" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="nodejs10" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="nodejs10-devel" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="npm10" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -4137,7 +4137,6 @@
     <package name="eog-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="eog-plugins" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="eog-plugins-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="epiphany-branding-openSUSE" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="eventviews" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="eventviews-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="evince" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index 112d76a6..9ee8342a 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -316,7 +316,7 @@
       <repopackage name="enchant-2-backend-hunspell"/>
       <repopackage name="enchant-data"/>
       <repopackage name="epiphany"/>
-      <repopackage name="epiphany-branding-upstream" arch="i586,i686"/>
+      <repopackage name="epiphany-branding-openSUSE"/>
       <repopackage name="epiphany-lang"/>
       <repopackage name="epson-inkjet-printer-escpr"/>
       <repopackage name="erofs-utils"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index 2c378226..f661c254 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -465,7 +465,7 @@
       <repopackage name="eog-plugins" arch="x86_64"/>
       <repopackage name="eog-plugins-lang" arch="x86_64"/>
       <repopackage name="epiphany"/>
-      <repopackage name="epiphany-branding-openSUSE" arch="x86_64"/>
+      <repopackage name="epiphany-branding-openSUSE"/>
       <repopackage name="epiphany-lang"/>
       <repopackage name="epson-inkjet-printer-escpr"/>
       <repopackage name="erofs-utils"/>
diff --git a/unsorted.yml b/unsorted.yml
index cf252d88..5ed7f5e9 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -3147,8 +3147,7 @@ unsorted:
   - ephoto 
   - ephoto-lang 
   - epic 
-  - epiphany-branding-openSUSE: [i586] 
-  - epiphany-branding-upstream: [x86_64] 
+  - epiphany-branding-upstream 
   - epour 
   - epour-lang 
   - epplet-base 
@@ -5706,7 +5705,7 @@ unsorted:
   - gnome-shell-search-provider-gnome-calendar 
   - gnome-shell-search-provider-gnome-characters: [i586] 
   - gnome-shell-search-provider-gnome-clocks: [i586] 
-  - gnome-shell-search-provider-gnome-games: [x86_64] 
+  - gnome-shell-search-provider-gnome-games 
   - gnome-shell-search-provider-gnome-photos: [i586] 
   - gnome-shell-search-provider-gnome-recipes 
   - gnome-shell-search-provider-gnome-terminal: [i586] 
@@ -7814,7 +7813,7 @@ unsorted:
   - kernel-kvmsmall: [x86_64] 
   - kernel-kvmsmall-devel: [x86_64] 
   - kernel-macros 
-  - kernel-obs-build: [x86_64] 
+  - kernel-obs-build 
   - kernel-obs-qa 
   - kernel-pae: [i586] 
   - kernel-pae-devel: [i586] 
@@ -22922,7 +22921,7 @@ unsorted:
   - python3-octaviaclient 
   - python3-odfpy 
   - python3-odorik 
-  - python3-ogr: [x86_64] 
+  - python3-ogr 
   - python3-oic 
   - python3-oiffile 
   - python3-onionshare 
@@ -23469,7 +23468,7 @@ unsorted:
   - python3-python-dbusmock 
   - python3-python-docs-theme 
   - python3-python-dotenv 
-  - python3-python-fedora: [x86_64] 
+  - python3-python-fedora 
   - python3-python-fileinspector 
   - python3-python-gammu 
   - python3-python-gflags 
@@ -23656,7 +23655,7 @@ unsorted:
   - python3-rpcq 
   - python3-rply 
   - python3-rpmconf 
-  - python3-rpmdeplint: [x86_64] 
+  - python3-rpmdeplint 
   - python3-rpmfile 
   - python3-rpmfluff 
   - python3-rpmlb