diff --git a/config.sh b/config.sh
index 68786de..c7d9e17 100644
--- a/config.sh
+++ b/config.sh
@@ -50,7 +50,7 @@ for i in langset NetworkManager firewalld; do
 done
 
 for i in sshd cron wicked purge-kernels; do
-	systemctl -f disable $i
+	systemctl -f disable $i || true
 done
 
 echo '# multipath needs to be excluded from dracut as it breaks os-prober' > /etc/dracut.conf.d/no-multipath.conf
diff --git a/list-common.sh b/list-common.sh
index 68ec905..f6f0f13 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -217,6 +217,9 @@ install patterns-base-x11
 installPattern x11
 installPattern sw_management
 
+# checkmedia is used for the 'Check media' entry in grub
+install checkmedia
+
 # For working with filesystems
 install bcache-tools
 install btrfsprogs
diff --git a/list-gnome.sh b/list-gnome.sh
index 899da65..d3bb1e1 100644
--- a/list-gnome.sh
+++ b/list-gnome.sh
@@ -120,3 +120,7 @@ buildignore opensuse-welcome
 
 # Pulls in a different WebKit version on Leap and doesn't offer any useful manuals anyway
 buildignore yelp
+# Same issue, but arguably useful and hopefully fixed soon.
+if [ "$distro" = "leap" ]; then
+	buildignore sushi
+fi
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index 2da90c2..0553b24 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -348,6 +348,7 @@
     <package name="patterns-base-x11"/>
     <namedCollection name="x11"/>
     <namedCollection name="sw_management"/>
+    <package name="checkmedia"/>
     <package name="bcache-tools"/>
     <package name="btrfsprogs"/>
     <package name="cryptsetup"/>
@@ -594,6 +595,8 @@
     <ignore name="opensuse-welcome"/>
     <package name="aaa_base" replaces="yelp"/>
     <ignore name="yelp"/>
+    <package name="aaa_base" replaces="sushi"/>
+    <ignore name="sushi"/>
   </packages>
   <packages type="bootstrap">
     <package name="filesystem"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 152055a..264d932 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -348,6 +348,7 @@
     <package name="patterns-base-x11"/>
     <namedCollection name="x11"/>
     <namedCollection name="sw_management"/>
+    <package name="checkmedia"/>
     <package name="bcache-tools"/>
     <package name="btrfsprogs"/>
     <package name="cryptsetup"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 2111aa4..bcde725 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -348,6 +348,7 @@
     <package name="patterns-base-x11"/>
     <namedCollection name="x11"/>
     <namedCollection name="sw_management"/>
+    <package name="checkmedia"/>
     <package name="bcache-tools"/>
     <package name="btrfsprogs"/>
     <package name="cryptsetup"/>
@@ -490,10 +491,8 @@
     <ignore name="yast2-control-center"/>
     <package name="aaa_base" replaces="yast2-control-center-qt"/>
     <ignore name="yast2-control-center-qt"/>
-    <package name="aaa_base" replaces="libyui-qt-pkg*"/>
-    <ignore name="libyui-qt-pkg*"/>
-    <package name="aaa_base" replaces="libyui-qt*"/>
-    <ignore name="libyui-qt*"/>
+    <package name="aaa_base" replaces="libyui*"/>
+    <ignore name="libyui*"/>
     <package name="aaa_base" replaces="Mesa-libva"/>
     <ignore name="Mesa-libva"/>
     <package name="aaa_base" replaces="python-base"/>
diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi
index ff5f686..c3fb3da 100644
--- a/livecd-leap-xfce.kiwi
+++ b/livecd-leap-xfce.kiwi
@@ -348,6 +348,7 @@
     <package name="patterns-base-x11"/>
     <namedCollection name="x11"/>
     <namedCollection name="sw_management"/>
+    <package name="checkmedia"/>
     <package name="bcache-tools"/>
     <package name="btrfsprogs"/>
     <package name="cryptsetup"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index a702212..d46c554 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Feb 21 15:27:21 UTC 2023 - Fabian Vogt <fvogt@suse.com>
+
+- list-gnome: ignore sushi on Leap, deps too big. Hopefully temporary.
+
+-------------------------------------------------------------------
+Wed Nov 23 07:44:58 UTC 2022 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- Explicitly list 'checkmedia' to be added to the live images
+  (boo#1205540).
+
 -------------------------------------------------------------------
 Thu Nov 17 10:22:49 UTC 2022 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index fd71d4d..f12c359 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -348,6 +348,7 @@
     <package name="patterns-base-x11"/>
     <namedCollection name="x11"/>
     <namedCollection name="sw_management"/>
+    <package name="checkmedia"/>
     <package name="bcache-tools"/>
     <package name="btrfsprogs"/>
     <package name="cryptsetup"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index d4bf873..e785a2d 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -348,6 +348,7 @@
     <package name="patterns-base-x11"/>
     <namedCollection name="x11"/>
     <namedCollection name="sw_management"/>
+    <package name="checkmedia"/>
     <package name="bcache-tools"/>
     <package name="btrfsprogs"/>
     <package name="cryptsetup"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 82369df..c645bf2 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -348,6 +348,7 @@
     <package name="patterns-base-x11"/>
     <namedCollection name="x11"/>
     <namedCollection name="sw_management"/>
+    <package name="checkmedia"/>
     <package name="bcache-tools"/>
     <package name="btrfsprogs"/>
     <package name="cryptsetup"/>
@@ -490,10 +491,8 @@
     <ignore name="yast2-control-center"/>
     <package name="aaa_base" replaces="yast2-control-center-qt"/>
     <ignore name="yast2-control-center-qt"/>
-    <package name="aaa_base" replaces="libyui-qt-pkg*"/>
-    <ignore name="libyui-qt-pkg*"/>
-    <package name="aaa_base" replaces="libyui-qt*"/>
-    <ignore name="libyui-qt*"/>
+    <package name="aaa_base" replaces="libyui*"/>
+    <ignore name="libyui*"/>
     <package name="aaa_base" replaces="Mesa-libva"/>
     <ignore name="Mesa-libva"/>
     <package name="aaa_base" replaces="python-base"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index 7852116..43536f7 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -348,6 +348,7 @@
     <package name="patterns-base-x11"/>
     <namedCollection name="x11"/>
     <namedCollection name="sw_management"/>
+    <package name="checkmedia"/>
     <package name="bcache-tools"/>
     <package name="btrfsprogs"/>
     <package name="cryptsetup"/>