diff --git a/manifest-build.yml b/manifest-build.yml
index 3dace5802be2f3990caff2be23a39283a588b23f..dc37bfb5ef3f49d218ab2359c1eca06e95e4030c 100644
--- a/manifest-build.yml
+++ b/manifest-build.yml
@@ -75,11 +75,15 @@ variables:
   - echo -e "section_end:`date +%s`:bitbake_run\r\e[0K"
 
 .build:
+  extends:
+    - .artifacts_upload
   variables:
     GIT_STRATEGY: none
     SETUPSCRIPT: "setup-environment"
     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
@@ -90,8 +94,8 @@ variables:
 
   artifacts:
     paths:
-      - "${BUILDPATH}/${IMAGEPATH}/*"
       - "${BUILDPATH}/${LICENSESPATH}/**/license.manifest"
+      - "${UPLOAD_ARTIFACTS_FILE}"
     reports:
       dotenv: build.env
 
@@ -156,6 +160,40 @@ variables:
               --outputdir-local="${outdir}"
       fi
 
+.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
+  artifacts:
+    paths:
+      - "artifacts.txt"
+
+.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
+
 .prepare_test:
   before_script:
     - *setup_ssh
diff --git a/manifest.yml b/manifest.yml
index b62b44db69aa534dde612581e3561aa640cf16db..1c74d4a31dd3e751399f470afe4104af63d8a47b 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -221,20 +221,17 @@ build:merge_request:
 # Stage: deploy
 # --------------------------------------------------------------------------------------
 .deployimage:
+  variables:
+    DOWNLOAD_ARTIFACTS: "file1, file2, file3"
   extends:
     - .infrastructure
-    - .package
+    - .artifacts_download
   rules:
     - if: $CI_COMMIT_REF_NAME != $MASTER_BRANCH_MANIFEST || $CI_PIPELINE_SOURCE == "api"
       when: manual
       allow_failure: true
   script:
     - echo
-  artifacts:
-    paths:
-      - release/**/**/*
-    reports:
-      dotenv: package.env
 
 # --------------------------------------------------------------------------------------
 # Stage: uploadftp
@@ -266,47 +263,47 @@ build:imx6guf:
   variables:
     CI_PARAM_MACHINE: imx6guf
 
-build:imx6ullguf:
-  extends: .buildimage
-  stage: build
-  variables:
-    CI_PARAM_MACHINE: imx6ullguf
-
-build:imx8mguf:
-  extends: .buildimage
-  stage: build
-  variables:
-    CI_PARAM_MACHINE: imx8mguf
-
-build:imx8mpguf:
-  extends: .buildimage
-  stage: build
-  variables:
-    CI_PARAM_MACHINE: imx8mpguf
-
-build:imx6guf:fngsystem:
-  extends: .buildfng
-  stage: build
-  variables:
-    CI_PARAM_MACHINE: imx6guf
-
-build:imx6ullguf:fngsystem:
-  extends: .buildfng
-  stage: build
-  variables:
-    CI_PARAM_MACHINE: imx6ullguf
-
-build:imx8mguf:fngsystem:
-  extends: .buildfng
-  stage: build
-  variables:
-    CI_PARAM_MACHINE: imx8mguf
-
-build:imx8mpguf:fngsystem:
-  extends: .buildfng
-  stage: build
-  variables:
-    CI_PARAM_MACHINE: imx8mpguf
+#build:imx6ullguf:
+#  extends: .buildimage
+#  stage: build
+#  variables:
+#    CI_PARAM_MACHINE: imx6ullguf
+#
+#build:imx8mguf:
+#  extends: .buildimage
+#  stage: build
+#  variables:
+#    CI_PARAM_MACHINE: imx8mguf
+#
+#build:imx8mpguf:
+#  extends: .buildimage
+#  stage: build
+#  variables:
+#    CI_PARAM_MACHINE: imx8mpguf
+#
+#build:imx6guf:fngsystem:
+#  extends: .buildfng
+#  stage: build
+#  variables:
+#    CI_PARAM_MACHINE: imx6guf
+#
+#build:imx6ullguf:fngsystem:
+#  extends: .buildfng
+#  stage: build
+#  variables:
+#    CI_PARAM_MACHINE: imx6ullguf
+#
+#build:imx8mguf:fngsystem:
+#  extends: .buildfng
+#  stage: build
+#  variables:
+#    CI_PARAM_MACHINE: imx8mguf
+#
+#build:imx8mpguf:fngsystem:
+#  extends: .buildfng
+#  stage: build
+#  variables:
+#    CI_PARAM_MACHINE: imx8mpguf
 
 # -------------------------------------------------------------------------------------
 
@@ -316,23 +313,23 @@ buildsdk:imx6guf:
   variables:
     CI_PARAM_MACHINE: imx6guf
 
-buildsdk:imx6ullguf:
-  extends: .buildsdk
-  stage: build
-  variables:
-    CI_PARAM_MACHINE: imx6ullguf
-
-buildsdk:imx8mguf:
-  extends: .buildsdk
-  stage: build
-  variables:
-    CI_PARAM_MACHINE: imx8mguf
-
-buildsdk:imx8mpguf:
-  extends: .buildsdk
-  stage: build
-  variables:
-    CI_PARAM_MACHINE: imx8mpguf
+#buildsdk:imx6ullguf:
+#  extends: .buildsdk
+#  stage: build
+#  variables:
+#    CI_PARAM_MACHINE: imx6ullguf
+#
+#buildsdk:imx8mguf:
+#  extends: .buildsdk
+#  stage: build
+#  variables:
+#    CI_PARAM_MACHINE: imx8mguf
+#
+#buildsdk:imx8mpguf:
+#  extends: .buildsdk
+#  stage: build
+#  variables:
+#    CI_PARAM_MACHINE: imx8mpguf
 
 # -------------------------------------------------------------------------------------
 
@@ -341,40 +338,40 @@ deployimage:imx6guf:
   stage: deploy
   needs: ["build:imx6guf", "changelog"]
 
-deployimage:imx6ullguf:
-  extends: .deployimage
-  stage: deploy
-  needs: ["build:imx6ullguf", "changelog"]
-
-deployimage:imx8mguf:
-  extends: .deployimage
-  stage: deploy
-  needs: ["build:imx8mguf", "changelog"]
-
-deployimage:imx8mpguf:
-  extends: .deployimage
-  stage: deploy
-  needs: ["build:imx8mpguf", "changelog"]
-
-deployimage:imx6guf:fngsystem:
-  extends: .deployimage
-  stage: deploy
-  needs: ["build:imx6guf:fngsystem", "changelog"]
-
-deployimage:imx6ullguf:fngsystem:
-  extends: .deployimage
-  stage: deploy
-  needs: ["build:imx6ullguf:fngsystem", "changelog"]
-
-deployimage:imx8mguf:fngsystem:
-  extends: .deployimage
-  stage: deploy
-  needs: ["build:imx8mguf:fngsystem", "changelog"]
-
-deployimage:imx8mpguf:fngsystem:
-  extends: .deployimage
-  stage: deploy
-  needs: ["build:imx8mpguf:fngsystem", "changelog"]
+#deployimage:imx6ullguf:
+#  extends: .deployimage
+#  stage: deploy
+#  needs: ["build:imx6ullguf", "changelog"]
+#
+#deployimage:imx8mguf:
+#  extends: .deployimage
+#  stage: deploy
+#  needs: ["build:imx8mguf", "changelog"]
+#
+#deployimage:imx8mpguf:
+#  extends: .deployimage
+#  stage: deploy
+#  needs: ["build:imx8mpguf", "changelog"]
+#
+#deployimage:imx6guf:fngsystem:
+#  extends: .deployimage
+#  stage: deploy
+#  needs: ["build:imx6guf:fngsystem", "changelog"]
+#
+#deployimage:imx6ullguf:fngsystem:
+#  extends: .deployimage
+#  stage: deploy
+#  needs: ["build:imx6ullguf:fngsystem", "changelog"]
+#
+#deployimage:imx8mguf:fngsystem:
+#  extends: .deployimage
+#  stage: deploy
+#  needs: ["build:imx8mguf:fngsystem", "changelog"]
+#
+#deployimage:imx8mpguf:fngsystem:
+#  extends: .deployimage
+#  stage: deploy
+#  needs: ["build:imx8mpguf:fngsystem", "changelog"]
 
 # -------------------------------------------------------------------------------------
 
@@ -385,46 +382,46 @@ uploadftp:imx6guf:
   stage: uploadftp
   needs: ["build:imx6guf", "buildsdk:imx6guf", "changelog"]
 
-uploadftp:imx6ullguf:
-  extends:
-    - .uploadftp
-    - .uploadsdkftp
-  stage: uploadftp
-  needs: ["build:imx6ullguf", "buildsdk:imx6ullguf", "changelog"]
-
-uploadftp:imx8mguf:
-  extends:
-    - .uploadftp
-    - .uploadsdkftp
-  stage: uploadftp
-  needs: ["build:imx8mguf", "buildsdk:imx8mguf", "changelog"]
-
-uploadftp:imx8mpguf:
-  extends:
-    - .uploadftp
-    - .uploadsdkftp
-  stage: uploadftp
-  needs: ["build:imx8mpguf", "buildsdk:imx8mpguf", "changelog"]
-
-uploadftp:imx6guf:fngsystem:
-  extends: .uploadftp
-  stage: uploadftp
-  needs: ["build:imx6guf:fngsystem", "changelog"]
-
-uploadftp:imx6ullguf:fngsystem:
-  extends: .uploadftp
-  stage: uploadftp
-  needs: ["build:imx6ullguf:fngsystem", "changelog"]
-
-uploadftp:imx8mguf:fngsystem:
-  extends: .uploadftp
-  stage: uploadftp
-  needs: ["build:imx8mguf:fngsystem", "changelog"]
-
-uploadftp:imx8mpguf:fngsystem:
-  extends: .uploadftp
-  stage: uploadftp
-  needs: ["build:imx8mpguf:fngsystem", "changelog"]
+#uploadftp:imx6ullguf:
+#  extends:
+#    - .uploadftp
+#    - .uploadsdkftp
+#  stage: uploadftp
+#  needs: ["build:imx6ullguf", "buildsdk:imx6ullguf", "changelog"]
+#
+#uploadftp:imx8mguf:
+#  extends:
+#    - .uploadftp
+#    - .uploadsdkftp
+#  stage: uploadftp
+#  needs: ["build:imx8mguf", "buildsdk:imx8mguf", "changelog"]
+#
+#uploadftp:imx8mpguf:
+#  extends:
+#    - .uploadftp
+#    - .uploadsdkftp
+#  stage: uploadftp
+#  needs: ["build:imx8mpguf", "buildsdk:imx8mpguf", "changelog"]
+#
+#uploadftp:imx6guf:fngsystem:
+#  extends: .uploadftp
+#  stage: uploadftp
+#  needs: ["build:imx6guf:fngsystem", "changelog"]
+#
+#uploadftp:imx6ullguf:fngsystem:
+#  extends: .uploadftp
+#  stage: uploadftp
+#  needs: ["build:imx6ullguf:fngsystem", "changelog"]
+#
+#uploadftp:imx8mguf:fngsystem:
+#  extends: .uploadftp
+#  stage: uploadftp
+#  needs: ["build:imx8mguf:fngsystem", "changelog"]
+#
+#uploadftp:imx8mpguf:fngsystem:
+#  extends: .uploadftp
+#  stage: uploadftp
+#  needs: ["build:imx8mpguf:fngsystem", "changelog"]
 
 # -------------------------------------------------------------------------------------
 
@@ -437,23 +434,23 @@ platformtest:imx6guf:
     CI_PARAM_MACHINE: imx6guf
     CI_PARAM_PLATFORMS: santaro santoka santino santino-lt
 
-platformtest:imx6ullguf:
-  extends: .test
-  stage: test
-  needs:
-    - job: build:imx6ullguf
-  variables:
-    CI_PARAM_MACHINE: imx6ullguf
-    CI_PARAM_PLATFORMS: nallino
-
-platformtest:imx8mguf:
-  extends: .test
-  stage: test
-  needs:
-    - job: build:imx6ullguf
-  variables:
-    CI_PARAM_MACHINE: imx8mguf
-    CI_PARAM_PLATFORMS: tanaro
+#platformtest:imx6ullguf:
+#  extends: .test
+#  stage: test
+#  needs:
+#    - job: build:imx6ullguf
+#  variables:
+#    CI_PARAM_MACHINE: imx6ullguf
+#    CI_PARAM_PLATFORMS: nallino
+#
+#platformtest:imx8mguf:
+#  extends: .test
+#  stage: test
+#  needs:
+#    - job: build:imx6ullguf
+#  variables:
+#    CI_PARAM_MACHINE: imx8mguf
+#    CI_PARAM_PLATFORMS: tanaro
 
 smoketest:imx6guf:
   extends: .test
@@ -466,24 +463,24 @@ smoketest:imx6guf:
     CI_PARAM_TEST_SUITE: boot.jinja2
     CI_PARAM_EXTRA: --all-devices
 
-smoketest:imx6ullguf:
-  extends: .test
-  stage: test
-  needs:
-    - job: build:imx6ullguf
-  variables:
-    CI_PARAM_MACHINE: imx6ullguf
-    CI_PARAM_PLATFORMS: imx6ullguf
-    CI_PARAM_TEST_SUITE: boot.jinja2
-    CI_PARAM_EXTRA: --all-devices
-
-smoketest:imx8mguf:
-  extends: .test
-  stage: test
-  needs:
-    - job: build:imx8mguf
-  variables:
-    CI_PARAM_MACHINE: imx8mguf
-    CI_PARAM_PLATFORMS: imx8mguf
-    CI_PARAM_TEST_SUITE: boot.jinja2
-    CI_PARAM_EXTRA: --all-devices
+#smoketest:imx6ullguf:
+#  extends: .test
+#  stage: test
+#  needs:
+#    - job: build:imx6ullguf
+#  variables:
+#    CI_PARAM_MACHINE: imx6ullguf
+#    CI_PARAM_PLATFORMS: imx6ullguf
+#    CI_PARAM_TEST_SUITE: boot.jinja2
+#    CI_PARAM_EXTRA: --all-devices
+#
+#smoketest:imx8mguf:
+#  extends: .test
+#  stage: test
+#  needs:
+#    - job: build:imx8mguf
+#  variables:
+#    CI_PARAM_MACHINE: imx8mguf
+#    CI_PARAM_PLATFORMS: imx8mguf
+#    CI_PARAM_TEST_SUITE: boot.jinja2
+#    CI_PARAM_EXTRA: --all-devices