diff --git a/manifest-build.yml b/manifest-build.yml
index dc37bfb5ef3f49d218ab2359c1eca06e95e4030c..e2095f187ba224c7e101f3cb506e7c7f056c2109 100644
--- a/manifest-build.yml
+++ b/manifest-build.yml
@@ -8,6 +8,7 @@ variables:
   DEPLOYPATH_TEST: "/artifacts/${CI_JOB_ID}/"
   GIT_BASE_URL: "git@${CI_SERVER_HOST}:${CI_PROJECT_ROOT_NAMESPACE}"
   TESTS_GIT_URL: "${GIT_BASE_URL}/yocto/tests.git"
+  UPLOADED_ARTIFACTS_FILE: "artifacts.txt"
 
 .setup_ssh: &setup_ssh
   # setup ssh key to access private repos
@@ -83,7 +84,6 @@ variables:
     INSTALLSCRIPTS: "fng-install.sh fngsystem-self-update.sh"
     BITBAKE_TASK: "build"
     UPLOAD_ARTIFACTS: "${BUILDPATH}/${IMAGEPATH}/*"
-    UPLOAD_ARTIFACTS_FILE: "artifacts.txt"
   before_script:
     - *setup_ssh
     - *repo_checkout
@@ -95,7 +95,7 @@ variables:
   artifacts:
     paths:
       - "${BUILDPATH}/${LICENSESPATH}/**/license.manifest"
-      - "${UPLOAD_ARTIFACTS_FILE}"
+      - "${UPLOADED_ARTIFACTS_FILE}"
     reports:
       dotenv: build.env
 
@@ -163,36 +163,28 @@ variables:
 .artifacts_upload:
   variables:
     UPLOAD_ARTIFACTS: ""
-    UPLOAD_ARTIFACTS_FILE: "artifacts.txt"
   after_script:
     - |
       echo "#### Upload Artifacts"
       UPLOADED_ARTIFACTS=$(find ${UPLOAD_ARTIFACTS} -type f)
       echo "Upload: ${UPLOADED_ARTIFACTS}"
-      #echo "UPLOADED_ARTIFACTS=\"${UPLOADED_ARTIFACTS}\"" >> artifacts.env
-      #echo "UPLOADED_ARTIFACTS=TEST123" > artifacts.env
-      echo "${UPLOADED_ARTIFACTS}" >> ${UPLOAD_ARTIFACTS_FILE}
-      #echo "UPLOADED_ARTIFACTS=\"${UPLOADED_ARTIFACTS}\"" >> build.env
-      echo "Show artifacts.txt
-      cat artifacts.txt
+      echo "${UPLOADED_ARTIFACTS}" >> ${UPLOADED_ARTIFACTS_FILE}
+      while IFS='' read -r LINE || [ -n "${LINE}" ]; do
+        echo "Upload: ${LINE}"
+      done < ${UPLOADED_ARTIFACTS_FILE}
   artifacts:
     paths:
-      - "artifacts.txt"
+      - ${UPLOADED_ARTIFACTS_FILE}
 
 .artifacts_download:
-  variables:
-    DOWNLOAD_ARTIFACTS: ""
   before_script:
     - |
       echo "#### Download Artifacts"
-      echo "Download: ${DOWNLOAD_ARTIFACTS}"
-      #[ -e artifacts.env ] && source artifacts.env && echo "Source artifacts.env ok"
       echo "Cat artifacts.txt"
-      cat artifacts.txt || echo "artifacts.txt not found"
-      echo "Available artifacts: ${UPLOADED_ARTIFACTS}"
-      printenv
-      #[ -e build.env ] && source build.env && echo "Source build.env ok"
-      #printenv
+      cat ${UPLOADED_ARTIFACTS_FILE} || echo "artifacts.txt not found"
+      while IFS='' read -r LINE || [ -n "${LINE}" ]; do
+        echo "Dowload: ${LINE}"
+      done < ${UPLOADED_ARTIFACTS_FILE}
 
 .prepare_test:
   before_script: