diff --git a/usr/bin/archboot-bootloader.sh b/usr/bin/archboot-bootloader.sh
index 1869b6db4..9c2c166fb 100755
--- a/usr/bin/archboot-bootloader.sh
+++ b/usr/bin/archboot-bootloader.sh
@@ -3,6 +3,7 @@
 # created by Tobias Powalowski <tpowa@archlinux.org>
 . /usr/lib/archboot/common.sh
 . /usr/lib/archboot/bootloader.sh
+[[ -z "${1}" || "${1}" != "run" ]] && _usage
 _SHIM=$(mktemp -d shim.XXX)
 _SHIM32=$(mktemp -d shim32.XXX)
 _SHIMAA64=$(mktemp -d shimaa64.XXX)
diff --git a/usr/bin/archboot-hwsim.sh b/usr/bin/archboot-hwsim.sh
index db51bec89..7e6cd04f4 100755
--- a/usr/bin/archboot-hwsim.sh
+++ b/usr/bin/archboot-hwsim.sh
@@ -2,8 +2,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 # archboot-hwsim.sh - setup a test SSID
 # by Tobias Powalowski <tpowa@archlinux.org>
-# usage(exitvalue)
-# outputs a usage message and exits with value
 . /usr/lib/archboot/common.sh
 _usage()
 {
diff --git a/usr/bin/archboot-qemu.sh b/usr/bin/archboot-qemu.sh
index 1eb619a1e..7190b8f9e 100755
--- a/usr/bin/archboot-qemu.sh
+++ b/usr/bin/archboot-qemu.sh
@@ -3,6 +3,7 @@
 # created by Tobias Powalowski <tpowa@archlinux.org>
 . /usr/lib/archboot/common.sh
 . /usr/lib/archboot/qemu.sh
+[[ -z "${1}" || "${1}" != "run" ]] && _usage
 _UBOOT=$(mktemp -d uboot.XXX)
 _OVMF32=$(mktemp -d ovmf32.XXX)
 _OVMF=$(mktemp -d ovmf.XXX)
diff --git a/usr/bin/archboot-restore-usbstick.sh b/usr/bin/archboot-restore-usbstick.sh
index 64c62e2c4..95789b194 100755
--- a/usr/bin/archboot-restore-usbstick.sh
+++ b/usr/bin/archboot-restore-usbstick.sh
@@ -8,12 +8,12 @@
 . /usr/lib/archboot/common.sh
 _usage()
 {
-    echo -e "\e[1mWelcome to \e[36mARCHBOOT\e[m \e[1m- RESTORE USB STICK:\e[m"
-    echo -e "\e[1m----------------------------------------\e[m"
+    echo -e "\e[1m\e[36mARCHBOOT\e[m \e[1m- Restore USB Stick\e[m"
+    echo -e "\e[1m----------------------------\e[m"
     echo -e "This script restores an USB device to a \e[1mFAT32\e[m device."
-    echo -e "\e[91mWARNING: ALL DATA WILL BE LOST ON THE DEVICE! \e[m"
+    echo -e "\e[1m\e[91mWARNING: ALL DATA WILL BE LOST ON THE DEVICE! \e[m"
     echo ""
-    echo -e "usage: \e[1m${_BASENAME} <device>\e[m"
+    echo -e "Usage: \e[1m${_BASENAME} <device>\e[m"
     exit 0
 }
 ##################################################
diff --git a/usr/lib/archboot/bootloader.sh b/usr/lib/archboot/bootloader.sh
index 5315ccb4b..f24e4545f 100644
--- a/usr/lib/archboot/bootloader.sh
+++ b/usr/lib/archboot/bootloader.sh
@@ -12,6 +12,15 @@ _SHIM_AA64_RPM="aarch64/shim-aa64-${_SHIM_VERSION}-${_SHIM_RELEASE}.aarch64.rpm"
 _ARCH_SERVERDIR="/${_PUB}/src/bootloader"
 _GRUB_ISO="/usr/share/archboot/grub/archboot-iso-grub.cfg"
 
+_usage() {
+    echo -e "\e[1m\e[36mArchboot\e[m\e[1m - Bootloader\e[m"
+    echo -e "\e[1m----------------\e[m"
+    echo "Upload bootloaders to archboot server."
+    echo ""
+    echo -e "Usage: \e[1m${_BASENAME} run\e[m"
+    exit 0
+}
+
 _grub_mkstandalone() {
     #shellcheck disable=SC2086
     ${1} ${2} grub-mkstandalone -d "/usr/lib/grub/${_GRUB_ARCH}" -O "${_GRUB_ARCH}" \
diff --git a/usr/lib/archboot/qemu.sh b/usr/lib/archboot/qemu.sh
index bd370b4e3..51072c156 100644
--- a/usr/lib/archboot/qemu.sh
+++ b/usr/lib/archboot/qemu.sh
@@ -14,6 +14,15 @@ _UBOOT_URL="http://ftp.us.debian.org/debian/pool/main/u/u-boot"
 _UBOOT_DEB="u-boot-qemu_${_UBOOT_VERSION}+${_UBOOT_RELEASE}.deb"
 _ARCH_SERVERDIR="/${_PUB}/src/qemu"
 
+_usage() {
+    echo -e "\e[1m\e[36mArchboot\e[m\e[1m - Qemu\e[m"
+    echo -e "\e[1m----------------\e[m"
+    echo "Upload qemu files to archboot server."
+    echo ""
+    echo -e "Usage: \e[1m${_BASENAME} run\e[m"
+    exit 0
+}
+
 _prepare_files () {
     # download packages from fedora server
     echo "Downloading Fedora OVMF and Debian UBOOT..."
diff --git a/usr/lib/archboot/run/server-release.sh b/usr/lib/archboot/run/server-release.sh
index 7ec85fc33..d65f08a30 100755
--- a/usr/lib/archboot/run/server-release.sh
+++ b/usr/lib/archboot/run/server-release.sh
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 . /usr/lib/archboot/common.sh
 . /usr/lib/archboot/server.sh
+[[ -z "${1}" || "${1}" != "run" ]] && _usage
 _root_check
 _container_check
 if echo "${_BASENAME}" | rg -qw 'riscv64' || echo "${_BASENAME}" | rg -qw 'aarch64'; then
diff --git a/usr/lib/archboot/server.sh b/usr/lib/archboot/server.sh
index bba603f23..e78fdc83a 100644
--- a/usr/lib/archboot/server.sh
+++ b/usr/lib/archboot/server.sh
@@ -5,6 +5,15 @@
 . /usr/lib/archboot/container.sh
 _ISO_BUILD_DIR="$(mktemp -d "${_ISO_HOME_ARCH}"/server-release.XXX)"
 
+_usage() {
+    echo -e "\e[1m\e[36mArchboot\e[m\e[1m - Server Release\e[m"
+    echo -e "\e[1m----------------\e[m"
+    echo "Upload new image to archboot server."
+    echo ""
+    echo -e "Usage: \e[1m${_BASENAME} run\e[m"
+    exit 0
+}
+
 _update_pacman_container() {
     if [[ "${_ARCH}" == "aarch64" ]]; then
         _ARCH_DIR="${_PACMAN_AARCH64}"