diff --git a/config.sh b/config.sh
index 072f0a1..a67bbe6 100644
--- a/config.sh
+++ b/config.sh
@@ -115,8 +115,12 @@ rm -rf /usr/share/doc/packages/*
 
 # Save more than 150 MiB by removing this, not very useful for lives
 rm -rf /lib/firmware/{liquidio,netronome,qed,mrvl,mellanox,cypress,dpaa2,bnx2x,cxgb4}
-# Keep some qcom firmware for Lenovo X13s and delete others (save ~50MiB)
-rm -rf /lib/firmware/qcom/{apq8016,apq8096,qcm2290,qrb4210,sdm845,sm8250,venus*,vpu*}
+if [ "$(arch)" == "aarch64" ]; then
+	# Keep some qcom firmware for Lenovo X13s and delete others (save ~50MiB)
+	rm -rf /lib/firmware/qcom/{apq8016,apq8096,qcm2290,qrb4210,sdm845,sm8250,venus*,vpu*}
+else
+	rm -rf /lib/firmware/qcom
+fi
 # the new, optional nvidia gsp firmware blobs are huge - ~ 70MB
 find /lib/firmware/nvidia -name gsp | xargs -r rm -rf 
 
@@ -148,7 +152,7 @@ zypper rl $(seq 1 $(zypper ll | wc -l))
 # sudoers hack to fix #297695 
 # (Installation Live CD: no need to ask for password of root)
 #--------------------------------------
-echo "ALL ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/50-livecd
+echo "linux ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/50-livecd
 
 /usr/sbin/useradd -m -u 1000 linux -c "Live-CD User" -p ""
 
diff --git a/list-common.sh b/list-common.sh
index ad423ed..490665e 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -245,10 +245,11 @@ install quota
 install xfsdump
 install xfsprogs
 
+install pciutils
+
 # This was previously recommended by rest_cd_core
 install adaptec-firmware
 install atmel-firmware
-install b43-fwcutter
 install bluez-firmware
 install crda
 install dmidecode
diff --git a/list-xfce.sh b/list-xfce.sh
index e7fb113..2b8c11c 100644
--- a/list-xfce.sh
+++ b/list-xfce.sh
@@ -14,6 +14,12 @@ buildignore gtk3-immodule-vietnamese
 buildignore awesfx
 buildignore sbl
 buildignore gnome-online-accounts
+buildignore samba
+
+if [ "$distro" = "leap" ]; then
+	# Avoid pipewire. The desktop portal isn't really needed here.
+	buildignore xdg-desktop-portal
+fi
 
 #temp disabled - until build fuxed
 buildignore pragha
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index e7ad0a6..f12bd61 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -367,9 +367,9 @@
     <package name="quota"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
+    <package name="pciutils"/>
     <package name="adaptec-firmware"/>
     <package name="atmel-firmware"/>
-    <package name="b43-fwcutter"/>
     <package name="bluez-firmware"/>
     <package name="crda"/>
     <package name="dmidecode"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 390dd3a..64f36f5 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -367,9 +367,9 @@
     <package name="quota"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
+    <package name="pciutils"/>
     <package name="adaptec-firmware"/>
     <package name="atmel-firmware"/>
-    <package name="b43-fwcutter"/>
     <package name="bluez-firmware"/>
     <package name="crda"/>
     <package name="dmidecode"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index d11bf04..193bc9f 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -367,9 +367,9 @@
     <package name="quota"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
+    <package name="pciutils"/>
     <package name="adaptec-firmware"/>
     <package name="atmel-firmware"/>
-    <package name="b43-fwcutter"/>
     <package name="bluez-firmware"/>
     <package name="crda"/>
     <package name="dmidecode"/>
diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi
index a239b8b..0de9439 100644
--- a/livecd-leap-xfce.kiwi
+++ b/livecd-leap-xfce.kiwi
@@ -367,9 +367,9 @@
     <package name="quota"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
+    <package name="pciutils"/>
     <package name="adaptec-firmware"/>
     <package name="atmel-firmware"/>
-    <package name="b43-fwcutter"/>
     <package name="bluez-firmware"/>
     <package name="crda"/>
     <package name="dmidecode"/>
@@ -443,6 +443,10 @@
     <ignore name="sbl"/>
     <package name="aaa_base" replaces="gnome-online-accounts"/>
     <ignore name="gnome-online-accounts"/>
+    <package name="aaa_base" replaces="samba"/>
+    <ignore name="samba"/>
+    <package name="aaa_base" replaces="xdg-desktop-portal"/>
+    <ignore name="xdg-desktop-portal"/>
     <package name="aaa_base" replaces="pragha"/>
     <ignore name="pragha"/>
     <package name="patterns-yast-yast2_basis"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 5b68eb4..00dcf43 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Dec 12 08:22:23 UTC 2023 - Fabian Vogt <fvogt@suse.com>
+
+- list-xfce: Drop samba. Not really used but recommended by the pattern
+- list-xfce: Drop xdg-desktop-portal on Leap.
+- Drop qcom FW on non-aarch64 again
+- Only allow passwordless sudo for linux
+
+-------------------------------------------------------------------
+Wed Dec  6 15:58:56 UTC 2023 - Fabian Vogt <fvogt@suse.com>
+
+- list-common: Drop b43-fwcutter. Only makes sense if there's already
+  a network connection. Keep pciutils though.
+
 -------------------------------------------------------------------
 Wed Dec  6 13:41:48 UTC 2023 - Dominique Leuenberger <dleuenberger@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 529d781..998cc48 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -367,9 +367,9 @@
     <package name="quota"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
+    <package name="pciutils"/>
     <package name="adaptec-firmware"/>
     <package name="atmel-firmware"/>
-    <package name="b43-fwcutter"/>
     <package name="bluez-firmware"/>
     <package name="crda"/>
     <package name="dmidecode"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index 1ec962c..a6b5cd6 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -367,9 +367,9 @@
     <package name="quota"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
+    <package name="pciutils"/>
     <package name="adaptec-firmware"/>
     <package name="atmel-firmware"/>
-    <package name="b43-fwcutter"/>
     <package name="bluez-firmware"/>
     <package name="crda"/>
     <package name="dmidecode"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 0803d49..853bab8 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -367,9 +367,9 @@
     <package name="quota"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
+    <package name="pciutils"/>
     <package name="adaptec-firmware"/>
     <package name="atmel-firmware"/>
-    <package name="b43-fwcutter"/>
     <package name="bluez-firmware"/>
     <package name="crda"/>
     <package name="dmidecode"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index 9dc4cf9..cf2bce0 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -367,9 +367,9 @@
     <package name="quota"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
+    <package name="pciutils"/>
     <package name="adaptec-firmware"/>
     <package name="atmel-firmware"/>
-    <package name="b43-fwcutter"/>
     <package name="bluez-firmware"/>
     <package name="crda"/>
     <package name="dmidecode"/>
@@ -443,6 +443,8 @@
     <ignore name="sbl"/>
     <package name="aaa_base" replaces="gnome-online-accounts"/>
     <ignore name="gnome-online-accounts"/>
+    <package name="aaa_base" replaces="samba"/>
+    <ignore name="samba"/>
     <package name="aaa_base" replaces="pragha"/>
     <ignore name="pragha"/>
     <package name="patterns-yast-yast2_basis"/>