diff --git a/list-common.sh b/list-common.sh
index 79eb2ff..64819ad 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -218,33 +218,49 @@ install yast2-network
 install yast2-proxy
 install yast2-storage-ng
 
+# For working with filesystems
+install bcache-tools
+install btrfsprogs
+install cryptsetup
+install device-mapper
+install dmraid
+install dosfstools
+install e2fsprogs
+# Not in Leap
+if [ "$distro" != "leap" ]; then
+	install exfat-utils
+fi
+install fcoe-utils
+install jfsutils
+install mdadm
+install multipath-tools
+install ntfs-3g
+install ntfsprogs
+install nvme-cli
+install open-iscsi
+install quota
+install xfsdump
+install xfsprogs
+
 # This was previously recommended by rest_cd_core
 install adaptec-firmware
 install atmel-firmware
 install b43-fwcutter
 install bluez-firmware
-install btrfsprogs
 install crda
-install cryptsetup
 install dmidecode
-install dosfstools
-install e2fsprogs
 install efibootmgr
 install gtk2-branding-openSUSE
 install ipw-firmware
 install iw
-install jfsutils
 install libatm1
 install lsb-release
 install lvm2
 install memtest86+ i686,x86_64
 install mpt-firmware
 install nano
-install ntfs-3g
-install open-iscsi
 install pptp
 install quota
-install reiserfs
 install rsync
 install smartmontools
 install smbios-utils-python  i686,x86_64
@@ -273,8 +289,6 @@ install xf86-video-tga
 install xf86-video-v4l
 install xf86-video-vesa
 install xf86-video-voodoo
-install xfsdump
-install xfsprogs
 install xz
 install yast2-trans-de
 if [ "$distro" = "leap" ]; then
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index 12dae37..f565123 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -336,32 +336,42 @@
     <package name="yast2-network"/>
     <package name="yast2-proxy"/>
     <package name="yast2-storage-ng"/>
+    <package name="bcache-tools"/>
+    <package name="btrfsprogs"/>
+    <package name="cryptsetup"/>
+    <package name="device-mapper"/>
+    <package name="dmraid"/>
+    <package name="dosfstools"/>
+    <package name="e2fsprogs"/>
+    <package name="fcoe-utils"/>
+    <package name="jfsutils"/>
+    <package name="mdadm"/>
+    <package name="multipath-tools"/>
+    <package name="ntfs-3g"/>
+    <package name="ntfsprogs"/>
+    <package name="nvme-cli"/>
+    <package name="open-iscsi"/>
+    <package name="quota"/>
+    <package name="xfsdump"/>
+    <package name="xfsprogs"/>
     <package name="adaptec-firmware"/>
     <package name="atmel-firmware"/>
     <package name="b43-fwcutter"/>
     <package name="bluez-firmware"/>
-    <package name="btrfsprogs"/>
     <package name="crda"/>
-    <package name="cryptsetup"/>
     <package name="dmidecode"/>
-    <package name="dosfstools"/>
-    <package name="e2fsprogs"/>
     <package name="efibootmgr"/>
     <package name="gtk2-branding-openSUSE"/>
     <package name="ipw-firmware"/>
     <package name="iw"/>
-    <package name="jfsutils"/>
     <package name="libatm1"/>
     <package name="lsb-release"/>
     <package name="lvm2"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
-    <package name="ntfs-3g"/>
-    <package name="open-iscsi"/>
     <package name="pptp"/>
     <package name="quota"/>
-    <package name="reiserfs"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
     <package name="smbios-utils-python" arch="i686,x86_64"/>
@@ -390,8 +400,6 @@
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
     <package name="xf86-video-voodoo"/>
-    <package name="xfsdump"/>
-    <package name="xfsprogs"/>
     <package name="xz"/>
     <package name="yast2-trans-de"/>
     <package name="yast2-trans-cs"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 4f39e21..7edd69e 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -336,32 +336,42 @@
     <package name="yast2-network"/>
     <package name="yast2-proxy"/>
     <package name="yast2-storage-ng"/>
+    <package name="bcache-tools"/>
+    <package name="btrfsprogs"/>
+    <package name="cryptsetup"/>
+    <package name="device-mapper"/>
+    <package name="dmraid"/>
+    <package name="dosfstools"/>
+    <package name="e2fsprogs"/>
+    <package name="fcoe-utils"/>
+    <package name="jfsutils"/>
+    <package name="mdadm"/>
+    <package name="multipath-tools"/>
+    <package name="ntfs-3g"/>
+    <package name="ntfsprogs"/>
+    <package name="nvme-cli"/>
+    <package name="open-iscsi"/>
+    <package name="quota"/>
+    <package name="xfsdump"/>
+    <package name="xfsprogs"/>
     <package name="adaptec-firmware"/>
     <package name="atmel-firmware"/>
     <package name="b43-fwcutter"/>
     <package name="bluez-firmware"/>
-    <package name="btrfsprogs"/>
     <package name="crda"/>
-    <package name="cryptsetup"/>
     <package name="dmidecode"/>
-    <package name="dosfstools"/>
-    <package name="e2fsprogs"/>
     <package name="efibootmgr"/>
     <package name="gtk2-branding-openSUSE"/>
     <package name="ipw-firmware"/>
     <package name="iw"/>
-    <package name="jfsutils"/>
     <package name="libatm1"/>
     <package name="lsb-release"/>
     <package name="lvm2"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
-    <package name="ntfs-3g"/>
-    <package name="open-iscsi"/>
     <package name="pptp"/>
     <package name="quota"/>
-    <package name="reiserfs"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
     <package name="smbios-utils-python" arch="i686,x86_64"/>
@@ -390,8 +400,6 @@
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
     <package name="xf86-video-voodoo"/>
-    <package name="xfsdump"/>
-    <package name="xfsprogs"/>
     <package name="xz"/>
     <package name="yast2-trans-de"/>
     <package name="yast2-trans-cs"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 0a929ed..72a771b 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -336,32 +336,42 @@
     <package name="yast2-network"/>
     <package name="yast2-proxy"/>
     <package name="yast2-storage-ng"/>
+    <package name="bcache-tools"/>
+    <package name="btrfsprogs"/>
+    <package name="cryptsetup"/>
+    <package name="device-mapper"/>
+    <package name="dmraid"/>
+    <package name="dosfstools"/>
+    <package name="e2fsprogs"/>
+    <package name="fcoe-utils"/>
+    <package name="jfsutils"/>
+    <package name="mdadm"/>
+    <package name="multipath-tools"/>
+    <package name="ntfs-3g"/>
+    <package name="ntfsprogs"/>
+    <package name="nvme-cli"/>
+    <package name="open-iscsi"/>
+    <package name="quota"/>
+    <package name="xfsdump"/>
+    <package name="xfsprogs"/>
     <package name="adaptec-firmware"/>
     <package name="atmel-firmware"/>
     <package name="b43-fwcutter"/>
     <package name="bluez-firmware"/>
-    <package name="btrfsprogs"/>
     <package name="crda"/>
-    <package name="cryptsetup"/>
     <package name="dmidecode"/>
-    <package name="dosfstools"/>
-    <package name="e2fsprogs"/>
     <package name="efibootmgr"/>
     <package name="gtk2-branding-openSUSE"/>
     <package name="ipw-firmware"/>
     <package name="iw"/>
-    <package name="jfsutils"/>
     <package name="libatm1"/>
     <package name="lsb-release"/>
     <package name="lvm2"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
-    <package name="ntfs-3g"/>
-    <package name="open-iscsi"/>
     <package name="pptp"/>
     <package name="quota"/>
-    <package name="reiserfs"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
     <package name="smbios-utils-python" arch="i686,x86_64"/>
@@ -390,8 +400,6 @@
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
     <package name="xf86-video-voodoo"/>
-    <package name="xfsdump"/>
-    <package name="xfsprogs"/>
     <package name="xz"/>
     <package name="yast2-trans-de"/>
     <package name="yast2-trans-cs"/>
diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi
index 6930fb2..037dada 100644
--- a/livecd-leap-xfce.kiwi
+++ b/livecd-leap-xfce.kiwi
@@ -336,32 +336,42 @@
     <package name="yast2-network"/>
     <package name="yast2-proxy"/>
     <package name="yast2-storage-ng"/>
+    <package name="bcache-tools"/>
+    <package name="btrfsprogs"/>
+    <package name="cryptsetup"/>
+    <package name="device-mapper"/>
+    <package name="dmraid"/>
+    <package name="dosfstools"/>
+    <package name="e2fsprogs"/>
+    <package name="fcoe-utils"/>
+    <package name="jfsutils"/>
+    <package name="mdadm"/>
+    <package name="multipath-tools"/>
+    <package name="ntfs-3g"/>
+    <package name="ntfsprogs"/>
+    <package name="nvme-cli"/>
+    <package name="open-iscsi"/>
+    <package name="quota"/>
+    <package name="xfsdump"/>
+    <package name="xfsprogs"/>
     <package name="adaptec-firmware"/>
     <package name="atmel-firmware"/>
     <package name="b43-fwcutter"/>
     <package name="bluez-firmware"/>
-    <package name="btrfsprogs"/>
     <package name="crda"/>
-    <package name="cryptsetup"/>
     <package name="dmidecode"/>
-    <package name="dosfstools"/>
-    <package name="e2fsprogs"/>
     <package name="efibootmgr"/>
     <package name="gtk2-branding-openSUSE"/>
     <package name="ipw-firmware"/>
     <package name="iw"/>
-    <package name="jfsutils"/>
     <package name="libatm1"/>
     <package name="lsb-release"/>
     <package name="lvm2"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
-    <package name="ntfs-3g"/>
-    <package name="open-iscsi"/>
     <package name="pptp"/>
     <package name="quota"/>
-    <package name="reiserfs"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
     <package name="smbios-utils-python" arch="i686,x86_64"/>
@@ -390,8 +400,6 @@
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
     <package name="xf86-video-voodoo"/>
-    <package name="xfsdump"/>
-    <package name="xfsprogs"/>
     <package name="xz"/>
     <package name="yast2-trans-de"/>
     <package name="yast2-trans-cs"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 996a296..d4e5ab8 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -4,6 +4,11 @@ Wed Mar 10 02:50:23 UTC 2021 - Maurizio Galli <maurizio.galli@gmail.com>
 - Enable creation of Xfce Leap Live images
 - Xfce switched to evince as pdf reader
 
+-------------------------------------------------------------------
+Mon Mar  8 09:43:08 UTC 2021 - Fabian Vogt <fvogt@suse.com>
+
+- list-common: Add more filesystem tools (boo#1183146)
+
 -------------------------------------------------------------------
 Thu Mar  4 11:18:15 UTC 2021 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 54ff44c..e9932f3 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -339,32 +339,43 @@
     <package name="yast2-network"/>
     <package name="yast2-proxy"/>
     <package name="yast2-storage-ng"/>
+    <package name="bcache-tools"/>
+    <package name="btrfsprogs"/>
+    <package name="cryptsetup"/>
+    <package name="device-mapper"/>
+    <package name="dmraid"/>
+    <package name="dosfstools"/>
+    <package name="e2fsprogs"/>
+    <package name="exfat-utils"/>
+    <package name="fcoe-utils"/>
+    <package name="jfsutils"/>
+    <package name="mdadm"/>
+    <package name="multipath-tools"/>
+    <package name="ntfs-3g"/>
+    <package name="ntfsprogs"/>
+    <package name="nvme-cli"/>
+    <package name="open-iscsi"/>
+    <package name="quota"/>
+    <package name="xfsdump"/>
+    <package name="xfsprogs"/>
     <package name="adaptec-firmware"/>
     <package name="atmel-firmware"/>
     <package name="b43-fwcutter"/>
     <package name="bluez-firmware"/>
-    <package name="btrfsprogs"/>
     <package name="crda"/>
-    <package name="cryptsetup"/>
     <package name="dmidecode"/>
-    <package name="dosfstools"/>
-    <package name="e2fsprogs"/>
     <package name="efibootmgr"/>
     <package name="gtk2-branding-openSUSE"/>
     <package name="ipw-firmware"/>
     <package name="iw"/>
-    <package name="jfsutils"/>
     <package name="libatm1"/>
     <package name="lsb-release"/>
     <package name="lvm2"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
-    <package name="ntfs-3g"/>
-    <package name="open-iscsi"/>
     <package name="pptp"/>
     <package name="quota"/>
-    <package name="reiserfs"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
     <package name="smbios-utils-python" arch="i686,x86_64"/>
@@ -393,8 +404,6 @@
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
     <package name="xf86-video-voodoo"/>
-    <package name="xfsdump"/>
-    <package name="xfsprogs"/>
     <package name="xz"/>
     <package name="yast2-trans-de"/>
     <package name="zd1211-firmware"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index 2aeeda1..83fccca 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -339,32 +339,43 @@
     <package name="yast2-network"/>
     <package name="yast2-proxy"/>
     <package name="yast2-storage-ng"/>
+    <package name="bcache-tools"/>
+    <package name="btrfsprogs"/>
+    <package name="cryptsetup"/>
+    <package name="device-mapper"/>
+    <package name="dmraid"/>
+    <package name="dosfstools"/>
+    <package name="e2fsprogs"/>
+    <package name="exfat-utils"/>
+    <package name="fcoe-utils"/>
+    <package name="jfsutils"/>
+    <package name="mdadm"/>
+    <package name="multipath-tools"/>
+    <package name="ntfs-3g"/>
+    <package name="ntfsprogs"/>
+    <package name="nvme-cli"/>
+    <package name="open-iscsi"/>
+    <package name="quota"/>
+    <package name="xfsdump"/>
+    <package name="xfsprogs"/>
     <package name="adaptec-firmware"/>
     <package name="atmel-firmware"/>
     <package name="b43-fwcutter"/>
     <package name="bluez-firmware"/>
-    <package name="btrfsprogs"/>
     <package name="crda"/>
-    <package name="cryptsetup"/>
     <package name="dmidecode"/>
-    <package name="dosfstools"/>
-    <package name="e2fsprogs"/>
     <package name="efibootmgr"/>
     <package name="gtk2-branding-openSUSE"/>
     <package name="ipw-firmware"/>
     <package name="iw"/>
-    <package name="jfsutils"/>
     <package name="libatm1"/>
     <package name="lsb-release"/>
     <package name="lvm2"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
-    <package name="ntfs-3g"/>
-    <package name="open-iscsi"/>
     <package name="pptp"/>
     <package name="quota"/>
-    <package name="reiserfs"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
     <package name="smbios-utils-python" arch="i686,x86_64"/>
@@ -393,8 +404,6 @@
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
     <package name="xf86-video-voodoo"/>
-    <package name="xfsdump"/>
-    <package name="xfsprogs"/>
     <package name="xz"/>
     <package name="yast2-trans-de"/>
     <package name="zd1211-firmware"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 8ec3115..ac91109 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -339,32 +339,43 @@
     <package name="yast2-network"/>
     <package name="yast2-proxy"/>
     <package name="yast2-storage-ng"/>
+    <package name="bcache-tools"/>
+    <package name="btrfsprogs"/>
+    <package name="cryptsetup"/>
+    <package name="device-mapper"/>
+    <package name="dmraid"/>
+    <package name="dosfstools"/>
+    <package name="e2fsprogs"/>
+    <package name="exfat-utils"/>
+    <package name="fcoe-utils"/>
+    <package name="jfsutils"/>
+    <package name="mdadm"/>
+    <package name="multipath-tools"/>
+    <package name="ntfs-3g"/>
+    <package name="ntfsprogs"/>
+    <package name="nvme-cli"/>
+    <package name="open-iscsi"/>
+    <package name="quota"/>
+    <package name="xfsdump"/>
+    <package name="xfsprogs"/>
     <package name="adaptec-firmware"/>
     <package name="atmel-firmware"/>
     <package name="b43-fwcutter"/>
     <package name="bluez-firmware"/>
-    <package name="btrfsprogs"/>
     <package name="crda"/>
-    <package name="cryptsetup"/>
     <package name="dmidecode"/>
-    <package name="dosfstools"/>
-    <package name="e2fsprogs"/>
     <package name="efibootmgr"/>
     <package name="gtk2-branding-openSUSE"/>
     <package name="ipw-firmware"/>
     <package name="iw"/>
-    <package name="jfsutils"/>
     <package name="libatm1"/>
     <package name="lsb-release"/>
     <package name="lvm2"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
-    <package name="ntfs-3g"/>
-    <package name="open-iscsi"/>
     <package name="pptp"/>
     <package name="quota"/>
-    <package name="reiserfs"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
     <package name="smbios-utils-python" arch="i686,x86_64"/>
@@ -393,8 +404,6 @@
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
     <package name="xf86-video-voodoo"/>
-    <package name="xfsdump"/>
-    <package name="xfsprogs"/>
     <package name="xz"/>
     <package name="yast2-trans-de"/>
     <package name="zd1211-firmware"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index 70797c8..c94a40b 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -339,32 +339,43 @@
     <package name="yast2-network"/>
     <package name="yast2-proxy"/>
     <package name="yast2-storage-ng"/>
+    <package name="bcache-tools"/>
+    <package name="btrfsprogs"/>
+    <package name="cryptsetup"/>
+    <package name="device-mapper"/>
+    <package name="dmraid"/>
+    <package name="dosfstools"/>
+    <package name="e2fsprogs"/>
+    <package name="exfat-utils"/>
+    <package name="fcoe-utils"/>
+    <package name="jfsutils"/>
+    <package name="mdadm"/>
+    <package name="multipath-tools"/>
+    <package name="ntfs-3g"/>
+    <package name="ntfsprogs"/>
+    <package name="nvme-cli"/>
+    <package name="open-iscsi"/>
+    <package name="quota"/>
+    <package name="xfsdump"/>
+    <package name="xfsprogs"/>
     <package name="adaptec-firmware"/>
     <package name="atmel-firmware"/>
     <package name="b43-fwcutter"/>
     <package name="bluez-firmware"/>
-    <package name="btrfsprogs"/>
     <package name="crda"/>
-    <package name="cryptsetup"/>
     <package name="dmidecode"/>
-    <package name="dosfstools"/>
-    <package name="e2fsprogs"/>
     <package name="efibootmgr"/>
     <package name="gtk2-branding-openSUSE"/>
     <package name="ipw-firmware"/>
     <package name="iw"/>
-    <package name="jfsutils"/>
     <package name="libatm1"/>
     <package name="lsb-release"/>
     <package name="lvm2"/>
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
-    <package name="ntfs-3g"/>
-    <package name="open-iscsi"/>
     <package name="pptp"/>
     <package name="quota"/>
-    <package name="reiserfs"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
     <package name="smbios-utils-python" arch="i686,x86_64"/>
@@ -393,8 +404,6 @@
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
     <package name="xf86-video-voodoo"/>
-    <package name="xfsdump"/>
-    <package name="xfsprogs"/>
     <package name="xz"/>
     <package name="yast2-trans-de"/>
     <package name="zd1211-firmware"/>