diff --git a/config.sh b/config.sh
index b373077..0130dc7 100644
--- a/config.sh
+++ b/config.sh
@@ -47,7 +47,8 @@ if rpm -q libQt6WebEngineCore6; then
 	rpm -e --nodeps libQt6WebEngineCore6
 fi
 
-/usr/lib/rpm/fdupes_wrapper /usr/share/licenses
+# Reuse what the macro does
+rpm --eval "%fdupes /usr/share/licenses" | sh
 
 #--------------------------------------
 # enable and disable services
diff --git a/list-common.sh b/list-common.sh
index 4223213..e9aab8c 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -118,6 +118,7 @@ buildignore usbmuxd
 # http://bugzilla.opensuse.org/show_bug.cgi?id=1209177
 buildignore gnome-keyring-pam
 buildignore pam_kwallet
+buildignore pam_kwallet6
 
 buildignore apparmor-docs
 buildignore mutt-doc
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index b58053e..1dd646c 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -239,6 +239,8 @@
     <ignore name="gnome-keyring-pam"/>
     <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet6 -->
+    <ignore name="pam_kwallet6"/>
     <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
     <!-- OBS-IgnorePackage: mutt-doc -->
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index a5853b8..425f874 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -239,6 +239,8 @@
     <ignore name="gnome-keyring-pam"/>
     <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet6 -->
+    <ignore name="pam_kwallet6"/>
     <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
     <!-- OBS-IgnorePackage: mutt-doc -->
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index d5c6d55..bd3d581 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -239,6 +239,8 @@
     <ignore name="gnome-keyring-pam"/>
     <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet6 -->
+    <ignore name="pam_kwallet6"/>
     <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
     <!-- OBS-IgnorePackage: mutt-doc -->
diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi
index 1e62175..d122579 100644
--- a/livecd-leap-xfce.kiwi
+++ b/livecd-leap-xfce.kiwi
@@ -239,6 +239,8 @@
     <ignore name="gnome-keyring-pam"/>
     <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet6 -->
+    <ignore name="pam_kwallet6"/>
     <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
     <!-- OBS-IgnorePackage: mutt-doc -->
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index e196457..54e6a08 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon May 13 09:24:27 UTC 2024 - Fabian Vogt <fvogt@suse.com>
+
+- Ignore pam_kwallet6 (boo#1224153)
+
 -------------------------------------------------------------------
 Wed May  8 14:14:09 UTC 2024 - Dominique Leuenberger <dleuenberger@suse.com>
 
@@ -37,6 +42,11 @@ Mon Apr 22 12:41:09 UTC 2024 - Ana Guerrero <ana.guerrero@suse.com>
 - Fix tumbleweed live image, try to decrease size following the new
   branding packages. Remove a few lang packages from xfce.
 
+-------------------------------------------------------------------
+Mon Mar 25 14:48:59 UTC 2024 - Fabian Vogt <fvogt@suse.com>
+
+- Use %fdupes in config.sh to fix build on Leap
+
 -------------------------------------------------------------------
 Tue Mar 19 16:18:33 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 7e6ee98..ced24b6 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -239,6 +239,8 @@
     <ignore name="gnome-keyring-pam"/>
     <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet6 -->
+    <ignore name="pam_kwallet6"/>
     <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
     <!-- OBS-IgnorePackage: mutt-doc -->
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index f150e58..c7d6a89 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -239,6 +239,8 @@
     <ignore name="gnome-keyring-pam"/>
     <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet6 -->
+    <ignore name="pam_kwallet6"/>
     <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
     <!-- OBS-IgnorePackage: mutt-doc -->
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 9f81cc3..192a5cc 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -239,6 +239,8 @@
     <ignore name="gnome-keyring-pam"/>
     <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet6 -->
+    <ignore name="pam_kwallet6"/>
     <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
     <!-- OBS-IgnorePackage: mutt-doc -->
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index e03faa1..e11338b 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -239,6 +239,8 @@
     <ignore name="gnome-keyring-pam"/>
     <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet6 -->
+    <ignore name="pam_kwallet6"/>
     <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
     <!-- OBS-IgnorePackage: mutt-doc -->