diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index 35f38a8ff9cbe7273bde2b7f85bd9abd72a8fe1c..d64720c7e258dbde4aa547fc4f00be69bb07aba6 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -216,16 +216,16 @@ retrigger:
   
   after_script:
       - |
-        echo -e "### **"$BOARD"_"$RECIPE_NAME"**" >> Job_message_"$BOARD"_"$RECIPE_NAME".txt
-        echo "##################################################################" >> Job_report_"$BOARD"_"$RECIPE_NAME".txt
-        echo ""$BOARD"_"$RECIPE_NAME" JOB STATUS" >> Job_report_"$BOARD"_"$RECIPE_NAME".txt
-        echo "##################################################################" >> Job_report_"$BOARD"_"$RECIPE_NAME".txt
+        echo -e "### **"$BOARD"_"$RECIPE_NAME"**" >> Job_build_message_"$BOARD"_"$RECIPE_NAME".txt
+        echo "##################################################################" >> Job_build_report_"$BOARD"_"$RECIPE_NAME".txt
+        echo ""$BOARD"_"$RECIPE_NAME" JOB STATUS" >> Job_build_report_"$BOARD"_"$RECIPE_NAME".txt
+        echo "##################################################################" >> Job_build_report_"$BOARD"_"$RECIPE_NAME".txt
         if [ $CI_JOB_STATUS == "failed" ]; then
-            echo -e "$CI_JOB_NAME: \t\t FAILED" >> Job_message_"$BOARD"_"$RECIPE_NAME".txt
-            echo -e "$CI_JOB_NAME: \t \t FAILED" >> Job_report_"$BOARD"_"$RECIPE_NAME".txt
+            echo -e "$CI_JOB_NAME: \t\t FAILED" >> Job_build_message_"$BOARD"_"$RECIPE_NAME".txt
+            echo -e "$CI_JOB_NAME: \t \t FAILED" >> Job_build_report_"$BOARD"_"$RECIPE_NAME".txt
         else
-            echo -e "$CI_JOB_NAME: \t\t $CI_JOB_STATUS" >> Job_message_"$BOARD"_"$RECIPE_NAME".txt
-            echo -e "$CI_JOB_NAME \t \t $CI_JOB_STATUS" >> Job_report_"$BOARD"_"$RECIPE_NAME".txt
+            echo -e "$CI_JOB_NAME: \t\t $CI_JOB_STATUS" >> Job_build_message_"$BOARD"_"$RECIPE_NAME".txt
+            echo -e "$CI_JOB_NAME \t \t $CI_JOB_STATUS" >> Job_build_report_"$BOARD"_"$RECIPE_NAME".txt
         fi
 
   artifacts:
@@ -233,8 +233,8 @@ retrigger:
      paths:
       - $BUILD_DIRECTORY/$IMAGES_PATH/$MACHINE/
       - pathname.txt
-      - Job_report_${BOARD}_${RECIPE_NAME}.txt
-      - Job_message_${BOARD}_${RECIPE_NAME}.txt
+      - Job_build_report_${BOARD}_${RECIPE_NAME}.txt
+      - Job_build_message_${BOARD}_${RECIPE_NAME}.txt
   allow_failure: true 
 
 #############################
@@ -275,8 +275,8 @@ retrigger:
          uboot_filename_latest="seco_"$PROCESSOR"_"$BOARD"_uboot_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
          kernel_filename="seco_"$PROCESSOR"_"$BOARD"_kernel_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz"
          kernel_filename_latest="seco_"$PROCESSOR"_"$BOARD"_kernel_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
-         filesystem_name="seco_"$PROCESSOR"_"$BOARD"_filesystem_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.bz2"
-         filesystem_name_latest="seco_"$PROCESSOR"_"$BOARD"_filesystem_"$KERNEL"_"$TAG_NAME"_latest.tar.bz2"
+         filesystem_name="seco_"$PROCESSOR"_"$BOARD"_filesystem-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.bz2"
+         filesystem_name_latest="seco_"$PROCESSOR"_"$BOARD"_filesystem-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest.tar.bz2"
          image_name="seco_"$PROCESSOR"_"$BOARD"_"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE"."$IMAGE_EXTENSION""
          image_name_latest="seco_"$PROCESSOR"_"$BOARD"_"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest."$IMAGE_EXTENSION""
          bmap_name="seco_"$PROCESSOR"_"$BOARD"_bmapfile-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".rootfs.wic.bmap"
@@ -460,6 +460,9 @@ retrigger:
 
  after_script:
      - |
+        mv Job_build_message_"$BOARD"_"$RECIPE_NAME".txt Job_message_"$BOARD"_"$RECIPE_NAME".txt
+        mv Job_build_report_"$BOARD"_"$RECIPE_NAME".txt Job_report_"$BOARD"_"$RECIPE_NAME".txt
+        
         if [ $CI_JOB_STATUS == "failed" ]; then
             echo -e "$CI_JOB_NAME: \t\t FAILED" >> Job_message_"$BOARD"_"$RECIPE_NAME".txt
             echo -e "$CI_JOB_NAME: \t \t FAILED" >> Job_report_"$BOARD"_"$RECIPE_NAME".txt
@@ -484,8 +487,8 @@ retrigger:
         uboot_filename_latest="seco_"$PROCESSOR"_"$BOARD"_uboot_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
         kernel_filename="seco_"$PROCESSOR"_"$BOARD"_kernel_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz"
         kernel_filename_latest="seco_"$PROCESSOR"_"$BOARD"_kernel_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
-        filesystem_name="seco_"$PROCESSOR"_"$BOARD"_filesystem_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.bz2"
-        filesystem_name_latest="seco_"$PROCESSOR"_"$BOARD"_filesystem_"$KERNEL"_"$TAG_NAME"_latest.tar.bz2"
+        filesystem_name="seco_"$PROCESSOR"_"$BOARD"_filesystem-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.bz2"
+        filesystem_name_latest="seco_"$PROCESSOR"_"$BOARD"_filesystem-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest.tar.bz2"
         image_name="seco_"$PROCESSOR"_"$BOARD"_"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE"."$IMAGE_EXTENSION""
         image_name_latest="seco_"$PROCESSOR"_"$BOARD"_"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest."$IMAGE_EXTENSION""
         bmap_name="seco_"$PROCESSOR"_"$BOARD"_bmapfile-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".rootfs.wic.bmap"