diff --git a/build-jobs-ci-test.yml.jinja2 b/build-jobs-ci-test.yml.jinja2
index ddb28e768740189864a6fdb959325ffd8a7bbdc7..295162d5cfa763c7624e0be993263e4656388071 100644
--- a/build-jobs-ci-test.yml.jinja2
+++ b/build-jobs-ci-test.yml.jinja2
@@ -35,7 +35,6 @@ build:files:
   stage: build
   extends:
     - .buildbase
-  needs: []
   tags:
     - infrastructure
   timeout: 2m
@@ -54,7 +53,6 @@ build:files:
 
 build:echo:
   stage: build
-  needs: []
   tags:
     - infrastructure
   timeout: 2m
@@ -67,7 +65,6 @@ build:check-foo-branch:
   stage: build
   extends:
     - .buildbase
-  needs: []
   tags:
     - infrastructure
   timeout: 2m
@@ -85,51 +82,30 @@ build:check-foo-branch:
       exit 1
     fi
 
-build-imx6guf-fake:
+simulate-build-seco-mx6:
   stage: build
-  needs: []
+  extends:
+    - .buildbase
   tags:
     - deploy
   timeout: 20m
-  image: ${CI_IMAGE_PYTHON}
   rules:
     - when: manual
       allow_failure: true
-  variables:
-    MANIFEST_VERSION: Yocto-dunfell-17.0
-    CI_PARAM_MACHINE: imx6guf
-    CI_PARAM_DISTRO: guf-wayland
-    CI_PARAM_IMAGE: guf-image
-    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/"
-    INSTALLSCRIPT: "fng-install.sh"
-    JOB_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/jobs/${CI_JOB_ID}/artifacts/"
-    FNG_INSTALL_PATH: "${BUILDPATH}/${IMAGEPATH}/${INSTALLSCRIPT}"
-
   script:
-    # TODO: this becomes similar to the yocto build and may be merged
-    - echo "BUILD_MACHINE=$CI_PARAM_MACHINE" > build.env
-    - echo "BUILD_IMAGE=$CI_PARAM_IMAGE" >> build.env
-    - echo "BUILD_DISTRO=$CI_PARAM_DISTRO" >> build.env
-    - echo "MANIFEST_VERSION=$MANIFEST_VERSION" >> build.env
-    - 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 "FNG_INSTALL_URL=${JOB_URL}${FNG_INSTALL_PATH}" >> build.env
-    - source build.env
-
-    - echo "Getting yocto build from Z:"
-    - mkdir -p $BUILD_PATH_IMAGE
-    - cp -v /artifacts-yocto/Releases/$MANIFEST_VERSION/$CI_PARAM_MACHINE/*.* $BUILD_PATH_IMAGE
-    - ls $BUILD_PATH_IMAGE
+    - echo "Getting Yocto build artifacts"
+    # We have to specify a tag here instead of getting the artifacts from a master
+    # branch, because we don't always execute the full pipeline on the master branches.
+    # In those cases the actual build job does not exist, which results in a 404 error.
+    - wget -O artifacts.zip
+      https://git.seco.com/seco-ne/yocto/manifest/-/jobs/artifacts/kirkstone/3.0/download?job=build-seco-mx6
+    - unzip artifacts.zip
   artifacts:
     reports:
       dotenv: build.env
     paths:
-      - build-guf-wayland-imx6guf/tmp/deploy/images/imx6guf/*
+      - build-*/tmp/deploy/images/**/*
+      - build-*/tmp/deploy/licenses/**/license.manifest
       - build.env
 
 # --------------------------------------------------------------------------------------
@@ -158,15 +134,14 @@ test:fail:
   variables:
     RETURNCODE: 1
 
-smoketest-imx6guf:
+smoketest:seco-mx6:
   extends:
     - .test
   stage: test
-  needs: [build-imx6guf-fake]
+  needs: [simulate-build-seco-mx6]
   variables:
     TEST_REPO_BRANCH: dunfell
     CI_PARAM_PLATFORMS: imx6guf
     CI_PARAM_EXTRA: --all-devices
     CI_PARAM_TEST_SUITE: boot.jinja2
-    CI_PARAM_BUILDJOB: build-imx6guf-fake
-
+    CI_PARAM_BUILDJOB: simulate-build-seco-mx6