diff --git a/build-jobs-yocto.jinja2 b/build-jobs-yocto.jinja2
index 9a616aedd756131c4ce0e35ba5ddb37ec50af151..ab99b260d049398ce8b42095a724515611352375 100644
--- a/build-jobs-yocto.jinja2
+++ b/build-jobs-yocto.jinja2
@@ -71,6 +71,10 @@ build-{{ machine }}:
     CI_PARAM_MACHINE: {{ machine }}
     CI_PARAM_DISTRO: {{ CI_PARAM_DISTRO }}
     CI_PARAM_IMAGE: {{ CI_PARAM_IMAGE }}
+  artifacts:
+    paths:
+      - build-{{ CI_PARAM_DISTRO }}-{{ machine }}/tmp/deploy/images/{{ machine }}/*
+      - build-{{ CI_PARAM_DISTRO }}-{{ machine }}/tmp/deploy/licenses/**/license.manifest
 
 # Build jobs for the sdk
 buildsdk-{{ machine }}:
@@ -80,6 +84,9 @@ buildsdk-{{ machine }}:
     CI_PARAM_MACHINE: {{ machine }}
     CI_PARAM_DISTRO: {{ CI_PARAM_DISTRO }}
     CI_PARAM_IMAGE: {{ CI_PARAM_IMAGE }}
+  artifacts:
+    paths:
+      - build-{{ CI_PARAM_DISTRO }}-{{ machine }}/tmp/deploy/sdk/*
 
 # Deploy jobs for the yocto image
 deployimage-{{ machine }}:
diff --git a/manifest-build.yml b/manifest-build.yml
index 430d701a2cdef3fad64448b4937d5d50bdb332d3..12967359bc7fc3396fc7ba7797894ae2fad528f6 100644
--- a/manifest-build.yml
+++ b/manifest-build.yml
@@ -112,9 +112,6 @@ variables:
     - *collect_srcrevs
     - *dump_install_command
   artifacts:
-    paths:
-      - "${BUILDPATH}/${IMAGEPATH}/*"
-      - "${BUILDPATH}/${LICENSESPATH}/**/license.manifest"
     reports:
       dotenv: build.env
 
@@ -173,9 +170,6 @@ variables:
     - when: manual
   variables:
     BITBAKE_TASK: "populate_sdk"
-  artifacts:
-    paths:
-      - "${BUILDPATH}/${SDKPATH}/*"
 
 # ---------------------------------------------------------------------------------------
 # Stage: test