diff --git a/list-common.sh b/list-common.sh
index 4343489..333c319 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -53,7 +53,7 @@ buildignore inxi
 buildignore sane-backends
 
 install branding-openSUSE
-install gfxboot  i686,x86_64
+install gfxboot  i686
 install shim x86_64
 
 # Don't pull in any -32bit libs
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index b371b40..568c84a 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -37,7 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686,x86_64"/>
+    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
@@ -160,7 +160,7 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686,x86_64"/>
+    <package name="gfxboot" arch="i686"/>
     <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 05de602..2a7a0bb 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -37,7 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686,x86_64"/>
+    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
@@ -160,7 +160,7 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686,x86_64"/>
+    <package name="gfxboot" arch="i686"/>
     <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 5edc2ed..5899874 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -37,7 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686,x86_64"/>
+    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
@@ -160,7 +160,7 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686,x86_64"/>
+    <package name="gfxboot" arch="i686"/>
     <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi
index 4fdaeca..5f98796 100644
--- a/livecd-leap-xfce.kiwi
+++ b/livecd-leap-xfce.kiwi
@@ -37,7 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686,x86_64"/>
+    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
@@ -160,7 +160,7 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686,x86_64"/>
+    <package name="gfxboot" arch="i686"/>
     <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 0cd15cb..b9f2ebb 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr 26 11:12:14 UTC 2021 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- Limit gfxboot to i686 only: on x86_64, we have been using grub2
+  to boot for quite a while already.
+
 -------------------------------------------------------------------
 Thu Apr 22 09:53:03 UTC 2021 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index e307242..df37809 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -37,7 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686,x86_64"/>
+    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
@@ -160,7 +160,7 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686,x86_64"/>
+    <package name="gfxboot" arch="i686"/>
     <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index c193496..50a34b7 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -37,7 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686,x86_64"/>
+    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
@@ -160,7 +160,7 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686,x86_64"/>
+    <package name="gfxboot" arch="i686"/>
     <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index e54fa53..8dc4963 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -37,7 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686,x86_64"/>
+    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
@@ -160,7 +160,7 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686,x86_64"/>
+    <package name="gfxboot" arch="i686"/>
     <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index edb47bc..eab8de1 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -37,7 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686,x86_64"/>
+    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
@@ -160,7 +160,7 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686,x86_64"/>
+    <package name="gfxboot" arch="i686"/>
     <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
diff --git a/livecd.kiwi.in b/livecd.kiwi.in
index 2c52559..324c1e4 100644
--- a/livecd.kiwi.in
+++ b/livecd.kiwi.in
@@ -37,7 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686,x86_64"/>
+    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->