diff --git a/usr/lib/archboot/cpio/hooks/installer b/usr/lib/archboot/cpio/hooks/installer
index 249d375a9..2187ae1e1 100644
--- a/usr/lib/archboot/cpio/hooks/installer
+++ b/usr/lib/archboot/cpio/hooks/installer
@@ -15,7 +15,7 @@ _run ()
     _file_rename /usr/bin/archboot-copy-mountpoint.sh /usr/bin/copy-mountpoint.sh
     _file_rename /usr/bin/archboot-rsync-backup.sh /usr/bin/rsync-backup.sh
     _file_rename /usr/bin/archboot-restore-usbstick.sh /usr/bin/restore-usbstick.sh
-    _file_rename /usr/bin/archboot-clean-blockdevice.sh /usr/bin/clean-blockdevice
+    _file_rename /usr/bin/archboot-clean-blockdevice.sh /usr/bin/clean-blockdevice.sh
     _file_rename /usr/bin/archboot-testsuite.sh /usr/bin/testsuite
     _full_dir /usr/lib/archboot/installer
     _file /etc/archboot/defaults
diff --git a/usr/lib/archboot/update/manage.sh b/usr/lib/archboot/update/manage.sh
index ce3a85933..5d07dc107 100644
--- a/usr/lib/archboot/update/manage.sh
+++ b/usr/lib/archboot/update/manage.sh
@@ -151,11 +151,11 @@ _download_latest_task() {
     ${_DLPROG} -o "${_ETC}/defaults" "${_SOURCE}${_ETC}/defaults?inline=false"
     # helper binaries
     # main binaries
-    _SCRIPTS="quickinst setup clock clean-blockdevice launcher localize network pacsetup update testsuite"
+    _SCRIPTS="quickinst setup clock launcher localize network pacsetup update testsuite"
     for i in ${_SCRIPTS}; do
         [[ -e "${_BIN}/${i}" ]] && ${_DLPROG} -o "${_BIN}/${i}" "${_SOURCE}${_BIN}/archboot-${i}.sh?inline=false"
     done
-    _SCRIPTS="copy-mountpoint rsync-backup restore-usbstick"
+    _SCRIPTS="clean-blockdevice copy-mountpoint rsync-backup restore-usbstick"
     for i in ${_SCRIPTS}; do
         [[ -e "${_BIN}/${i}.sh" ]] && ${_DLPROG} -o "${_BIN}/${i}.sh" "${_SOURCE}${_BIN}/archboot-${i}.sh?inline=false"
     done
diff --git a/usr/share/bash-completion/completions/clean-blockdevice b/usr/share/bash-completion/completions/clean-blockdevice.sh
similarity index 80%
rename from usr/share/bash-completion/completions/clean-blockdevice
rename to usr/share/bash-completion/completions/clean-blockdevice.sh
index 46c596fca..6dcdd161b 100644
--- a/usr/share/bash-completion/completions/clean-blockdevice
+++ b/usr/share/bash-completion/completions/clean-blockdevice.sh
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 # created by Tobias Powalowski <tpowa@archlinux.org>
-_clean-blockdevice()
+_clean_blockdevice()
 {
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
@@ -8,4 +8,4 @@ _clean-blockdevice()
     COMPREPLY=( $(compgen -W "$(lsblk -pnro NAME,TYPE | rg '(.*) disk$' -r '$1')" -- $cur) )
     return 0
 }
-complete -F _clean-blockdevice clean-blockdevice
+complete -F _clean_blockdevice clean-blockdevice.sh