diff --git a/usr/bin/archboot-aarch64-create-repository.sh b/usr/bin/archboot-aarch64-create-repository.sh
index 184cc3c8b..cfcaca4a9 100755
--- a/usr/bin/archboot-aarch64-create-repository.sh
+++ b/usr/bin/archboot-aarch64-create-repository.sh
@@ -22,7 +22,7 @@ if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
     _pacman_chroot "${_REPODIR}" "${_ARCHBOOT_AARCH64_CHROOT_PUBLIC}" "${_PACMAN_AARCH64_CHROOT}" || exit 1
     _create_pacman_conf "${_REPODIR}" "use_container_config"
     _pacman_parameters "${_REPODIR}" "use_binfmt"
-    _download_packages "${_REPODIR}" || exit 1
+    _download_packages "${_REPODIR}" "use_binfmt" || exit 1
 fi
 _move_packages "${_REPODIR}" "${1}" || exit 1
 _cleanup_repodir "${_REPODIR}" || exit 1
diff --git a/usr/bin/archboot-riscv64-create-repository.sh b/usr/bin/archboot-riscv64-create-repository.sh
index 796ea1d63..73c1b3e46 100755
--- a/usr/bin/archboot-riscv64-create-repository.sh
+++ b/usr/bin/archboot-riscv64-create-repository.sh
@@ -22,7 +22,7 @@ if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
     _pacman_chroot "${_REPODIR}" "${_ARCHBOOT_RISCV64_CHROOT_PUBLIC}" "${_PACMAN_RISCV64_CHROOT}" || exit 1
     _create_pacman_conf "${_REPODIR}" "use_container_config"
     _pacman_parameters "${_REPODIR}" "use_binfmt"
-    _download_packages "${_REPODIR}" || exit 1
+    _download_packages "${_REPODIR}" "use_binfmt" || exit 1
 fi
 _move_packages "${_REPODIR}" "${1}" || exit 1
 _cleanup_repodir "${_REPODIR}" || exit 1
diff --git a/usr/lib/archboot/repository.sh b/usr/lib/archboot/repository.sh
index 08609f85a..24574faf6 100644
--- a/usr/lib/archboot/repository.sh
+++ b/usr/lib/archboot/repository.sh
@@ -12,11 +12,11 @@ _usage () {
 }
 
 _download_packages() {
-    _PACMAN_OPTIONS="${_PACKAGES} ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} ${_PACMAN_DEFAULTS}"
     if [[ "${2}" == "use_binfmt" ]]; then
-        _copy_gpg_key
-        _riscv64_disable_graphics
+        _copy_gpg_key "${1}"
+        _riscv64_disable_graphics "${1}"
     fi
+    _PACMAN_OPTIONS="${_PACKAGES} ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} ${_PACMAN_DEFAULTS}"
     _pacman_key
     echo "Downloading packages ${_PACKAGES} ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} to ${1} ..."
     ${_PACMAN} -Syw ${_PACMAN_OPTIONS} ${_PACMAN_DB} >/dev/null 2>&1 || exit 1