diff --git a/imagebuilder.sh b/imagebuilder.sh
index 15a0fc1..dd38c1d 100755
--- a/imagebuilder.sh
+++ b/imagebuilder.sh
@@ -16,8 +16,8 @@ IMAGEBUILDER_REGISTRY="${IMAGEBUILDER_REGISTRY:-registry.service.mooncarrot.spac
 source "${lantern_path}/lantern.sh";
 
 if [[ -z "${BASE_PATH}" ]]; then
-	subtask_begin "BASE_PATH environment variable not found - setting base path to ${HC}${PWD}${RS}";
-	BASE_PATH="${PWD}";
+	subtask_begin "BASE_PATH environment variable not found - setting base path to ${HC}${repo_root}/images${RS}";
+	BASE_PATH="${repo_root}/images";
 	subtask_end "$?";
 fi
 if [[ ! -d "${BASE_PATH}" ]]; then