diff --git a/list-common.sh b/list-common.sh
index 63d4728..ba928e6 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -53,8 +53,6 @@ buildignore inxi
 buildignore sane-backends
 
 install branding-openSUSE
-install gfxboot i686
-install shim x86_64
 
 # Don't pull in any -32bit libs
 buildignore glibc-32bit
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index fa8a78c..386ed3f 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -37,8 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
-    <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="patterns-base-bootloader"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
     <package name="e2fsprogs" bootinclude="true"/>
@@ -49,8 +48,6 @@
     <package name="tar"/>
     <package name="patch"/>
     <package name="zypper"/>
-    <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="grub2-arm64-efi" arch="aarch64"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
@@ -163,8 +160,6 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686"/>
-    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index ca29993..8ef3d24 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -37,8 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
-    <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="patterns-base-bootloader"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
     <package name="e2fsprogs" bootinclude="true"/>
@@ -49,8 +48,6 @@
     <package name="tar"/>
     <package name="patch"/>
     <package name="zypper"/>
-    <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="grub2-arm64-efi" arch="aarch64"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
@@ -163,8 +160,6 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686"/>
-    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 9db1144..a0a0510 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -37,8 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
-    <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="patterns-base-bootloader"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
     <package name="e2fsprogs" bootinclude="true"/>
@@ -49,8 +48,6 @@
     <package name="tar"/>
     <package name="patch"/>
     <package name="zypper"/>
-    <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="grub2-arm64-efi" arch="aarch64"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
@@ -163,8 +160,6 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686"/>
-    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>
diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi
index 6f6e78f..566b2db 100644
--- a/livecd-leap-xfce.kiwi
+++ b/livecd-leap-xfce.kiwi
@@ -37,8 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
-    <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="patterns-base-bootloader"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
     <package name="e2fsprogs" bootinclude="true"/>
@@ -49,8 +48,6 @@
     <package name="tar"/>
     <package name="patch"/>
     <package name="zypper"/>
-    <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="grub2-arm64-efi" arch="aarch64"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
@@ -163,8 +160,6 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686"/>
-    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 459268d..0b36596 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jun 22 12:05:26 UTC 2023 - Fabian Vogt <fvogt@suse.com>
+
+- livecd.kiwi.in, list-common.sh: Make use of patterns-base-bootloader and
+  drop redundant package inclusions. This also adds mokutil (boo#1209985).
+- Drop gfxboot, kiwi uses grub2 on ix86 for some time now
+
 -------------------------------------------------------------------
 Thu Jun 22 06:14:21 UTC 2023 - Dominique Leuenberger <dleuenberger@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index bae276a..8710153 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -37,8 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
-    <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="patterns-base-bootloader"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
     <package name="e2fsprogs" bootinclude="true"/>
@@ -49,8 +48,6 @@
     <package name="tar"/>
     <package name="patch"/>
     <package name="zypper"/>
-    <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="grub2-arm64-efi" arch="aarch64"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
@@ -163,8 +160,6 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686"/>
-    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index edbfb00..72c89ef 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -37,8 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
-    <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="patterns-base-bootloader"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
     <package name="e2fsprogs" bootinclude="true"/>
@@ -49,8 +48,6 @@
     <package name="tar"/>
     <package name="patch"/>
     <package name="zypper"/>
-    <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="grub2-arm64-efi" arch="aarch64"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
@@ -163,8 +160,6 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686"/>
-    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 0d472d7..ddf77cc 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -37,8 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
-    <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="patterns-base-bootloader"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
     <package name="e2fsprogs" bootinclude="true"/>
@@ -49,8 +48,6 @@
     <package name="tar"/>
     <package name="patch"/>
     <package name="zypper"/>
-    <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="grub2-arm64-efi" arch="aarch64"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
@@ -163,8 +160,6 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686"/>
-    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index 83d15cf..83d0195 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -37,8 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
-    <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="patterns-base-bootloader"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
     <package name="e2fsprogs" bootinclude="true"/>
@@ -49,8 +48,6 @@
     <package name="tar"/>
     <package name="patch"/>
     <package name="zypper"/>
-    <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="grub2-arm64-efi" arch="aarch64"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
@@ -163,8 +160,6 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot" arch="i686"/>
-    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>
diff --git a/livecd.kiwi.in b/livecd.kiwi.in
index 0bc8566..7d5a0cf 100644
--- a/livecd.kiwi.in
+++ b/livecd.kiwi.in
@@ -37,8 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686"/>
-    <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="patterns-base-bootloader"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
     <package name="e2fsprogs" bootinclude="true"/>
@@ -49,8 +48,6 @@
     <package name="tar"/>
     <package name="patch"/>
     <package name="zypper"/>
-    <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="grub2-arm64-efi" arch="aarch64"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>