diff --git a/build-pipeline-yocto.yml.jinja2 b/build-pipeline-yocto.yml.jinja2
index aca5dbef02f6d2260ab75cbc14735aa63c5addfd..8092025b94d16250802f456ad5694267e00655d7 100644
--- a/build-pipeline-yocto.yml.jinja2
+++ b/build-pipeline-yocto.yml.jinja2
@@ -74,7 +74,7 @@ build-{{ machine }}:
     # 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.
-    BUILD_ARTIFACTS: ${BUILD_ARTIFACTS_PREFIX}-{{ machine }}
+    BUILD_ARTIFACTS: ${BUILD_ARTIFACTS_{{ machine | replace("-", "_") }}}
   after_script:
     # FIXME: This is necessary because we're using an old build for the build simulation
     # which does not export these variables, yet. Can be removed as soon as we switch to
diff --git a/manifest-pipeline-ci-test.yml b/manifest-pipeline-ci-test.yml
index 7e16b56f6b02d2ff8c5dde8345053e29b0c1675e..6ec4b035198370dcb3b4f9aebf66f11ad1125452 100644
--- a/manifest-pipeline-ci-test.yml
+++ b/manifest-pipeline-ci-test.yml
@@ -62,8 +62,10 @@ yocto-simulation-pipeline:
     - .build-pipeline
     - .yocto-deploy
   variables:
-    BUILD_ARTIFACTS_PREFIX: >-
-      https://git.seco.com/seco-ne/yocto/manifest/-/jobs/artifacts/kirkstone/14.0/download?job=build
+    BUILD_ARTIFACTS_seco_mx6: >-
+      https://git.seco.com/seco-ne/yocto/manifest/-/jobs/507268/artifacts/download
+    BUILD_ARTIFACTS_seco_mx8mm: >-
+      https://git.seco.com/seco-ne/yocto/manifest/-/jobs/507272/artifacts/download
     YOCTO_IMAGE: seconorth-image
     YOCTO_DISTRO: seconorth-wayland
     SETUP_SCRIPT: /dev/null
@@ -85,8 +87,10 @@ sdk-simulation-pipeline:
     - .build-pipeline
     - .yocto-deploy
   variables:
-    BUILD_ARTIFACTS_PREFIX: >-
-      https://git.seco.com/seco-ne/yocto/manifest/-/jobs/artifacts/kirkstone/14.0/download?job=buildsdk
+    BUILD_ARTIFACTS_seco_mx6: >-
+      https://git.seco.com/seco-ne/yocto/manifest/-/jobs/507274/artifacts/download
+    BUILD_ARTIFACTS_seco_mx8mm: >-
+      https://git.seco.com/seco-ne/yocto/manifest/-/jobs/507280/artifacts/download
     YOCTO_IMAGE: seconorth-image
     YOCTO_DISTRO: seconorth-wayland
     SETUP_SCRIPT: /dev/null