diff --git a/lib/yashchiki/build_image.sh b/lib/yashchiki/build_image.sh
index 0838660cc4f6da94726ce0e964be70b55b2e7b53..30531bdbe83614a3e14d76fd9d957d24cf3c8ebb 100755
--- a/lib/yashchiki/build_image.sh
+++ b/lib/yashchiki/build_image.sh
@@ -3,12 +3,7 @@
 set -euo pipefail
 shopt -s inherit_errexit 2>/dev/null || true
 
-if (( $(find ${YASHCHIKI_SANDBOXES} -mindepth 1 -maxdepth 1 | wc -l) > 1 )); then
-    echo "More than one sandbox found, this should never happen!" >&2
-    exit 1
-fi
-
-TARGET_FOLDER="$(find ${YASHCHIKI_SANDBOXES} -mindepth 1 -maxdepth 1)"
+TARGET_FOLDER="${YASHCHIKI_SANDBOXES}/${CONTAINER_STYLE}"
 
 # We want the spack folder to be available inside the container image
 # -> it needs to be bind mounted to the sandbox folder