diff --git a/build-pipeline.yml b/build-pipeline.yml
index 0f0f136bec8ccd5633dda8f4f7e27f8b63ead38e..b3730c7cc6145594e56870b8b9678339d25d910f 100644
--- a/build-pipeline.yml
+++ b/build-pipeline.yml
@@ -56,7 +56,7 @@ workflow:
 .collect_srcrevs: &collect_srcrevs
   # write all package AUTOREVS to file
   - |-
-    SRCREVS_FILE="${CI_PROJECT_DIR}/${BUILDPATH}/${IMAGEPATH}/BUILD_SRCREVS.log"
+    SRCREVS_FILE="${CI_PROJECT_DIR}/${IMAGEPATH}/BUILD_SRCREVS.log"
     if [ -d "$( dirname "${SRCREVS_FILE}" )" ];then
         buildhistory-collect-srcrevs > ${SRCREVS_FILE}
         echo "${LOGPREFIX} buildhistory-collect-srcrevs:"
@@ -67,7 +67,7 @@ workflow:
   # print install instructions
   - |-
     if [[ ! -z "${INSTALLSCRIPT}" ]]; then
-      SCRIPT="${CI_PROJECT_DIR}/${BUILDPATH}/${IMAGEPATH}/${INSTALLSCRIPT}"
+      SCRIPT="${CI_PROJECT_DIR}/${IMAGEPATH}/${INSTALLSCRIPT}"
       if [ ! -f "${SCRIPT}" ]; then
           echo "Install script missing, searched for '$SCRIPT'"
           exit 1
@@ -114,9 +114,9 @@ workflow:
 
 .save_build_env: &save_build_env
   # Artifact paths are needed for packaging
-  - echo "BUILD_PATH_IMAGE=${BUILDPATH}/${IMAGEPATH}" >> build.env
-  - echo "BUILD_PATH_SDK=${BUILDPATH}/${SDKPATH}" >> build.env
-  - echo "BUILD_PATH_LICENSE=${BUILDPATH}/${LICENSESPATH}" >> build.env
+  - echo "BUILD_PATH_IMAGE=${IMAGEPATH}" >> build.env
+  - echo "BUILD_PATH_SDK=${SDKPATH}" >> build.env
+  - echo "BUILD_PATH_LICENSE=${LICENSESPATH}" >> build.env
   # Install script location is needed in test job
   - echo "FNG_INSTALL_URL=${JOB_URL}${FNG_INSTALL_PATH}" >> build.env
 
@@ -213,12 +213,11 @@ workflow:
     SETUPSCRIPT: "setup-environment"
     LOGPREFIX: "CI:build:"
     BUILDPATH: "build-${CI_PARAM_DISTRO}-${CI_PARAM_MACHINE}"
-    IMAGEBASEPATH: "tmp/deploy/images/"
-    IMAGEPATH: "${IMAGEBASEPATH}/${CI_PARAM_MACHINE}"
-    LICENSESPATH: "tmp/deploy/licenses"
-    SDKPATH: "tmp/deploy/sdk/"
+    IMAGEPATH: "${BUILDPATH}/tmp/deploy/images/${CI_PARAM_MACHINE}"
+    LICENSESPATH: "${BUILDPATH}/tmp/deploy/licenses"
+    SDKPATH: "${BUILDPATH}/tmp/deploy/sdk"
     JOB_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/jobs/${CI_JOB_ID}/artifacts/"
-    FNG_INSTALL_PATH: "${BUILDPATH}/${IMAGEPATH}/${INSTALLSCRIPT}"
+    FNG_INSTALL_PATH: "${IMAGEPATH}/${INSTALLSCRIPT}"
   before_script:
     - *docker_check
     - *setup_ssh