diff --git a/conf/distro/include/seconorth-distro.inc b/conf/distro/include/seconorth-distro.inc
index 88f3d49b6bd269034c3a5f8cf560512dd721c251..4b313e5f27b942aee96624510a7fe962939090ce 100644
--- a/conf/distro/include/seconorth-distro.inc
+++ b/conf/distro/include/seconorth-distro.inc
@@ -28,15 +28,11 @@ DISTRO_BOOT_FILES = " \
     boot.cfg \
 "
 
-# The variables DISTRO_IMAGES, DISTRO_RELEASE_ARTEFACTS
-# are used by the CI to copy/or link the needed files into the release folder
-
-# Add an entry for each FSTYPE
-DISTRO_IMAGES = "${@' '.join([ d.getVar('IMAGE_LINK_NAME') + '.' + fs for fs in d.getVar('IMAGE_FSTYPES').split() ] )}"
-
-# List build results that are later handled in the CI
+# DISTRO_RELEASE_ARTEFACTS is used by the CI to package the files for the release
 DISTRO_RELEASE_ARTEFACTS = " \
-    ${DISTRO_IMAGES} \
+    ${@' '.join([ d.getVar('IMAGE_LINK_NAME') + '.' + fs for fs in d.getVar('IMAGE_FSTYPES').split() ] )} \
+    ${IMAGE_LINK_NAME}.manifest \
+    ${IMAGE_LINK_NAME}.testdata.json \
     ${MACHINE_INSTALL_SCRIPTS} \
 "
 
diff --git a/conf/distro/seconorth-fngsystem.conf b/conf/distro/seconorth-fngsystem.conf
index c0c3c69c6b087ad1e4cdee8ab6bfb9eb178c13a5..2d971ebdb93f32c6c554a24a22bdde38744883ef 100644
--- a/conf/distro/seconorth-fngsystem.conf
+++ b/conf/distro/seconorth-fngsystem.conf
@@ -44,16 +44,11 @@ DISTRO_BOOT_FILES = " \
 
 IMAGE_BOOT_FILES:append = " ${DISTRO_BOOT_FILES} "
 
-# The variables DISTRO_IMAGES, DISTRO_RELEASE_ARTEFACTS
-# are used by the CI to copy/or link the needed files into the release folder
-
-DISTRO_IMAGES:append = " ${IMAGE_LINK_NAME}.tgz"
-DISTRO_IMAGES:append:mx8= " imx-boot.tar.gz imx-boot "
-
-# List build results that are later handled in the CI
-DISTRO_RELEASE_ARTEFACTS:append = "${IMAGE_LINK_NAME}.md5 "
-
+# DISTRO_RELEASE_ARTEFACTS is used by the CI to package the files for the release
+DISTRO_RELEASE_ARTEFACTS:append = " ${IMAGE_LINK_NAME}.tgz ${IMAGE_LINK_NAME}.md5"
 DISTRO_RELEASE_ARTEFACTS:append:mx8 = " \
+    imx-boot.tar.gz \
+    imx-boot \
     ${KERNEL_IMAGETYPE}-${KERNEL_IMAGE_LINK_NAME}${KERNEL_IMAGE_BIN_EXT} \
     ${@' '.join([ "uuu-" + dtb.split('/')[-1].split('.')[0] + '.bat' for dtb in d.getVar('KERNEL_DEVICETREE').split() if dtb.endswith('.dtb') ] )} \
     ${@' '.join([ "uuu-" + dtb.split('/')[-1].split('.')[0] + '.sh'  for dtb in d.getVar('KERNEL_DEVICETREE').split() if dtb.endswith('.dtb') ] )} \