diff --git a/usr/bin/archboot-aarch64-create-container.sh b/usr/bin/archboot-aarch64-create-container.sh
index 9b5286c3e..527cf4f16 100755
--- a/usr/bin/archboot-aarch64-create-container.sh
+++ b/usr/bin/archboot-aarch64-create-container.sh
@@ -27,8 +27,8 @@ fi
 if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
     _aarch64_pacman_chroot "${1}" || exit 1
     _create_pacman_conf "${1}" "use_container_config"
-    _aarch64_install_base_packages "${1}" || exit 1
-    _aarch64_install_archboot "${1}" || exit 1
+    _other_install_base_packages "${1}" || exit 1
+    _other_install_archboot "${1}" || exit 1
     _fix_groups "${1}"
     _clean_mkinitcpio "${1}"
     _clean_cache "${1}"
diff --git a/usr/bin/archboot-riscv64-create-container.sh b/usr/bin/archboot-riscv64-create-container.sh
new file mode 100755
index 000000000..e0498ca39
--- /dev/null
+++ b/usr/bin/archboot-riscv64-create-container.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+# created by Tobias Powalowski <tpowa@archlinux.org>
+. /usr/lib/archboot/common.sh
+. /usr/lib/archboot/container.sh
+_ARCHBOOT="archboot-riscv"
+_KEYRING="archlinux"
+[[ -z "${1}" ]] && _usage
+_parameters "$@"
+_root_check
+echo "Starting container creation ..."
+[[ -d "${1}" ]] || (echo "Create directory ${1} ..."; mkdir "${1}")
+if [[ "${_RUNNING_ARCH}" == "riscv64" ]]; then
+    _create_pacman_conf "${1}"
+    _prepare_pacman "${1}" || exit 1
+    _install_base_packages "${1}" || exit 1
+    _clean_mkinitcpio "${1}"
+    _clean_cache "${1}"
+    _install_archboot "${1}" || exit 1
+    _clean_cache "${1}"
+    _umount_special "${1}" || exit 1
+    _fix_groups "${1}"
+    _clean_container "${1}"
+    _clean_archboot_cache
+    _generate_keyring "${1}" || exit 1
+    _copy_mirrorlist_and_pacman_conf "${1}"
+fi
+if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
+    _riscv64_pacman_chroot "${1}" || exit 1
+    _create_pacman_conf "${1}" "use_container_config"
+    _other_install_base_packages "${1}" || exit 1
+    _other_install_archboot "${1}" || exit 1
+    _fix_groups "${1}"
+    _clean_mkinitcpio "${1}"
+    _clean_cache "${1}"
+    _clean_container "${1}" 2>/dev/null
+fi
+_change_pacman_conf "${1}" || exit 1
+_reproducibility "${1}"
+_set_hostname "${1}" || exit 1
+echo "Finished container setup in ${1} ."