diff --git a/usr/lib/archboot/cpio/hooks/base_common b/usr/lib/archboot/cpio/hooks/base_common
index 2da34fb70..22da96f60 100644
--- a/usr/lib/archboot/cpio/hooks/base_common
+++ b/usr/lib/archboot/cpio/hooks/base_common
@@ -5,10 +5,11 @@
 _run ()
 {
     # add basic apps
-    _map _binary bash blkid bsdcpio cat cp cut dialog echo env find grep gzip halt init journalctl  \
-                 kmod loadkeys logger ls lsblk lsmod mkdir mkfs.btrfs modprobe less mount mountpoint mv poweroff \
-                 reboot rm sh shutdown sleep sed setfont sulogin systemctl systemd-{tmpfiles,sysctl} \
-                 udevadm umount uname
+    _map _binary bash blkid bsdcpio cat cp cut dialog echo env find grep \
+                 gzip halt init journalctl kmod loadkeys logger ls lsblk \
+                 lsmod mkdir mkfs.btrfs modprobe less mount mountpoint mv \
+                 poweroff reboot rm sh shutdown sleep sed setfont sulogin \
+                 systemctl systemd-{tmpfiles,sysctl} udevadm umount uname
     # launch systemd
     _symlink /init /usr/lib/systemd/systemd
     ### adding needed files from running system
diff --git a/usr/lib/archboot/cpio/hooks/filesystems b/usr/lib/archboot/cpio/hooks/filesystems
index 7237041bc..f187d40ef 100644
--- a/usr/lib/archboot/cpio/hooks/filesystems
+++ b/usr/lib/archboot/cpio/hooks/filesystems
@@ -4,21 +4,24 @@
 
 _run ()
 {
-    _map _binary mkswap badblocks debugfs dumpe2fs e2fsck \
-        e2image e2undo findfs fsck logsave mkfs.ext2 resize2fs chattr lsattr e2freefrag filefrag \
-        jfs_debugfs jfs_fsck jfs_fscklog jfs_logdump jfs_mkfs jfs_tune mkfs.xfs xfs_copy xfs_db xfs_estimate xfs_fsr xfs_io \
-        xfs_logprint xfs_mdrestore xfs_repair xfs_rtcp mkdosfs dosfsck fatlabel mount.smb3 mount.cifs \
-        fsck.ext2 fsck.ext3 fsck.ext4 e2label tune2fs mkfs.ext3 mkfs.ext4 mke2fs fsck.jfs \
-        mkfs.jfs wipefs btrfs btrfsck btrfs-find-root btrfs-image btrfs-map-logical btrfs-select-super \
-        btrfstune mkfs.nilfs2 mount.nilfs2 nilfs_cleanerd cifs.idmap cifs.upcall cifscreds getcifsacl \
-        setcifsacl umount.nilfs2 chcp dumpseg lscp lssu mkcp rmcp fsck.cramfs fsck.minix fsfreeze \
-        fstrim mkfs.bfs mkfs.cramfs mkfs.minix mkfs.f2fs fsck.exfat mkfs.exfat \
-        tune.exfat exfatlabel dump.exfat fatresize nvme fsck.msdos fsck.vfat mkfs.vfat mkfs.msdos fsck.btrfs dosfslabel \
-        e2mmpstatus e2scrub e2scrub_all e4crypt e4defrag defrag.f2fs dump.f2fs f2fs_io f2fscrypt fibmap.f2fs fsck.f2fs \
-        parse.f2fs resize.f2fs sload.f2fs blkmapd nfsconf nfsdcld nfsidmap nfsv4.exportd nilfs-clean \
-        nilfs-resize nilfs-tune xfs_growfs xfs_quota \
-        xfs_spaceman compile_et mk_cmds fsck.xfs xfs_admin xfs_bmap xfs_freeze \
-        xfs_info xfs_metadump xfs_mkfile xfs_ncheck gpart
+    _map _binary mkswap badblocks debugfs dumpe2fs e2fsck e2image e2undo findfs \
+                 fsck logsave mkfs.ext2 resize2fs chattr lsattr e2freefrag filefrag \
+                 jfs_debugfs jfs_fsck jfs_fscklog jfs_logdump jfs_mkfs jfs_tune \
+                 mkfs.xfs xfs_copy xfs_db xfs_estimate xfs_fsr xfs_io xfs_logprint \
+                 xfs_mdrestore xfs_repair xfs_rtcp mkdosfs dosfsck fatlabel mount.smb3 \
+                 mount.cifs fsck.ext2 fsck.ext3 fsck.ext4 e2label tune2fs mkfs.ext3 \
+                 mkfs.ext4 mke2fs fsck.jfs mkfs.jfs wipefs btrfs btrfsck btrfs-find-root \
+                 btrfs-image btrfs-map-logical btrfs-select-super btrfstune mkfs.nilfs2 \
+                 mount.nilfs2 nilfs_cleanerd cifs.idmap cifs.upcall cifscreds getcifsacl \
+                 setcifsacl umount.nilfs2 chcp dumpseg lscp lssu mkcp rmcp fsck.cramfs \
+                 fsck.minix fsfreeze fstrim mkfs.bfs mkfs.cramfs mkfs.minix mkfs.f2fs \
+                 fsck.exfat mkfs.exfat tune.exfat exfatlabel dump.exfat fatresize nvme \
+                 fsck.msdos fsck.vfat mkfs.vfat mkfs.msdos fsck.btrfs dosfslabel \
+                 e2mmpstatus e2scrub e2scrub_all e4crypt e4defrag defrag.f2fs dump.f2fs \
+                 f2fs_io f2fscrypt fibmap.f2fs fsck.f2fs parse.f2fs resize.f2fs sload.f2fs \
+                 blkmapd nfsconf nfsdcld nfsidmap nfsv4.exportd nilfs-clean nilfs-resize \
+                 nilfs-tune xfs_growfs xfs_quota xfs_spaceman compile_et mk_cmds fsck.xfs \
+                 xfs_admin xfs_bmap xfs_freeze xfs_info xfs_metadump xfs_mkfile xfs_ncheck gpart
     _file /etc/nilfs_cleanerd.conf
     _map _full_dir /etc/{cifs-utils,request-key.d,nvme}
     # fix libinih for plasma wallpaper