diff --git a/usr/lib/archboot/container.sh b/usr/lib/archboot/container.sh
index 7e63df027..0844225a0 100644
--- a/usr/lib/archboot/container.sh
+++ b/usr/lib/archboot/container.sh
@@ -34,7 +34,7 @@ _clean_cache() {
     if grep -qw 'archboot' /etc/hostname; then
         echo "Cleaning archboot /var/cache/pacman/pkg ..."
         for i in "${1}"/var/cache/pacman/pkg/*; do
-            [[ "${i}" == "${1}/var/cache/pacman/pkg/archboot.db" ]] || rm -f /var/cache/pacman/pkg/$(basename "${i}")
+            [[ "${i}" == "${1}/var/cache/pacman/pkg/archboot.db" ]] || rm -f /var/cache/pacman/pkg/"$(basename "${i}")"
         done
     fi
 }
diff --git a/usr/lib/archboot/iso.sh b/usr/lib/archboot/iso.sh
index a3cfe44cb..03b2e5f1c 100644
--- a/usr/lib/archboot/iso.sh
+++ b/usr/lib/archboot/iso.sh
@@ -79,7 +79,7 @@ _prepare_kernel_initramfs_files_RISCV64() {
     echo "Prepare RISCV64 u-boot ..."
     #shellcheck disable=SC1090
     source "${_PRESET}"
-    mkdir -p ${_ISODIR}/boot
+    mkdir -p "${_ISODIR}"/boot
     install -m644 "${ALL_kver}" "${_ISODIR}/boot/vmlinuz_${_RUNNING_ARCH}"
     mkinitcpio -c "${MKINITCPIO_CONFIG}" -k "${ALL_kver}" -g "${_ISODIR}/boot/initramfs_${_RUNNING_ARCH}.img" || exit 1
 }