diff --git a/usr/lib/archboot/common.sh b/usr/lib/archboot/common.sh
index 00d849352..e51e86ca6 100644
--- a/usr/lib/archboot/common.sh
+++ b/usr/lib/archboot/common.sh
@@ -40,7 +40,11 @@ _WAYLAND_PACKAGE="egl-wayland"
 _STANDARD_PACKAGES="gparted xorg-xhost mtools noto-fonts"
 # chromium is now working on riscv64
 [[ "${_RUNNING_ARCH}" == "riscv64" ]] && _STANDARD_BROWSER="firefox"
-_NSPAWN="systemd-nspawn -q -D"
+if [[ -d "${_ISO_HOME}" ]]; then
+    _NSPAWN="systemd-nspawn -q --bind ${_ISO_HOME} -D"
+else
+    _NSPAWN="systemd-nspawn -q -D"
+fi
 _MAN_INFO_PACKAGES="man-db man-pages texinfo"
 
 ### check for root
diff --git a/usr/lib/archboot/server.sh b/usr/lib/archboot/server.sh
index 9b0d6104f..0324b5cf3 100644
--- a/usr/lib/archboot/server.sh
+++ b/usr/lib/archboot/server.sh
@@ -107,7 +107,8 @@ _update_source() {
 
 _server_release() {
     cd "${_ISO_HOME_ARCH}" || exit 1
-    "archboot-${_ARCH}-release.sh" "${_ISO_BUILD_DIR}" "file:///${_ISO_HOME_SOURCE}/${_DIR}" || exit 1
+    # needed else package cache is not reachable on binfmt containers
+    "archboot-${_ARCH}-release.sh" "${_ISO_BUILD_DIR}" "file://${_ISO_HOME_SOURCE}/${_DIR}" || exit 1
     # set user rights on files
     [[ -d "${_ISO_BUILD_DIR}" ]] || exit 1
     chmod 755 "${_ISO_BUILD_DIR}"