diff --git a/usr/bin/archboot-testsuite.sh b/usr/bin/archboot-testsuite.sh
index d304d25b3..ce315b2ae 100755
--- a/usr/bin/archboot-testsuite.sh
+++ b/usr/bin/archboot-testsuite.sh
@@ -69,9 +69,9 @@ _run_test "on missing base binaries"
 _BASE_BLACKLIST="arpd backup bashbug enosys exch fsck.cramfs fsck.minix gawk-5.3.0 \
 gawkbug gencat getconf iconv iconvconfig importctl lastlog2 ld.so locale lsclocks makedb \
 makepkg-template memusage memusagestat mkfs.bfs mkfs.cramfs mkfs.minix mtrace newgidmap \
-newuidmap pcprofiledump pldd pstree.x11 restore routel run0 setpgid sln sotruss sprof \
-systemd-confext systemd-cryptsetup systemd-delta systemd-home-fallback-shell systemd-repart \
-systemd-run systemd-vmspawn systemd-vpick varlinkctl xtrace"
+newuidmap pcprofiledump pivot_root pldd pstree.x11 restore routel run0 setpgid sln sotruss \
+sprof switch_root systemd-confext systemd-cryptsetup systemd-delta systemd-home-fallback-shell \
+systemd-repart systemd-run systemd-vmspawn systemd-vpick varlinkctl xtrace"
 archboot-binary-check.sh base &>>"${_LOG}"
 #shellcheck disable=SC2013
 for i in $(rg '/usr/bin/(.*)' -r '$1' binary.log); do
diff --git a/usr/lib/archboot/cpio/hooks/base_system b/usr/lib/archboot/cpio/hooks/base_system
index d4bee7ea5..b1e062307 100644
--- a/usr/lib/archboot/cpio/hooks/base_system
+++ b/usr/lib/archboot/cpio/hooks/base_system
@@ -15,7 +15,7 @@ _run ()
                  lz4{,c,cat} lz{cat,cmp,diff,egrep,fgrep,grep,less,more,ma,madec,mainfo,op} \
                  mcookie md5sum mesg mk{fifo,fs,nod} modinfo namei new{grp,gid_map,uid_map} \
                  nice nl nohup nproc nsenter numfmt partx paste pathchk pidwait pinky \
-                 pg pipesz {pivot,switch}_root pkill pmap pr printenv prlimit prtstat pslog \
+                 pg pipesz pkill pmap pr printenv prlimit prtstat pslog \
                  pstree ptx pwdx pzstd read{link,profile} rename renice request-key \
                  resizepart reset rev rtcwake run{con,user} script{,live,replay} sdparm \
                  seq set{arch,cap,facl,fattr,priv,sid,term} sfdisk \
diff --git a/usr/lib/archboot/cpio/hooks/base_system_cleanup b/usr/lib/archboot/cpio/hooks/base_system_cleanup
index 1f3f9be90..4d8929853 100644
--- a/usr/lib/archboot/cpio/hooks/base_system_cleanup
+++ b/usr/lib/archboot/cpio/hooks/base_system_cleanup
@@ -17,7 +17,7 @@ link,linux{32,64},logname,look,losetup,ls{cpu,fd,ipc,irq,locks,logins,mem,ns},\
 lz4{,c,cat},lz{cat,cmp,diff,egrep,fgrep,grep,less,more,ma,madec,mainfo,op},\
 mcookie,md5sum,mesg,mk{fifo,fs,nod},modinfo,namei,new{grp,gidmap,uidmap},\
 nice,nl,nohup,nproc,nsenter,numfmt,partx,paste,pathchk,pidwait,pinky,\
-pg,pipesz,{pivot,switch}_root,pkill,pmap,pr,printenv,prlimit,prtstat,pslog,\
+pg,pipesz,pkill,pmap,pr,printenv,prlimit,prtstat,pslog,\
 pstree,ptx,pwdx,pzstd,read{link,profile},rename,renice,request-key,\
 resizepart,reset,rev,rtcwake,run{con,user},script{,live,replay},sdparm,\
 seq,set{arch,cap,facl,fattr,priv,sid,term},sfdisk,sha{1sum,224sum,256sum,\