diff --git a/Jenkinsfile_Common b/Jenkinsfile_Common
index 0e7ba70..11a73df 100644
--- a/Jenkinsfile_Common
+++ b/Jenkinsfile_Common
@@ -115,9 +115,9 @@ def cleanupDistroVersion() {
 }
 
 
-def archiveImages(imgageDir) {
+def archiveImages(imgageDir, imgType) {
   dir ('tmp/artifacts') {
-    zip archive: true, dir: "${WORKSPACE}/${imgageDir}", glob: "*", zipFile: "${env.PACKAGE_NAME}-${env.BUILD_VERSION}-${params.MACHINE}-${params.IMAGE_TYPE}.zip"
+    zip archive: true, dir: "${WORKSPACE}/${imgageDir}", glob: "*", zipFile: "${env.PACKAGE_NAME}-${env.BUILD_VERSION}-${params.MACHINE}-${imgType}.zip"
   }
   sh "rm -rf ${WORKSPACE}/tmp"
 }
diff --git a/Jenkinsfile_RamdiskImages b/Jenkinsfile_RamdiskImages
index a7139af..ef84acf 100644
--- a/Jenkinsfile_RamdiskImages
+++ b/Jenkinsfile_RamdiskImages
@@ -79,7 +79,7 @@ pipeline {
         script {
           build(params.IMAGE_TYPE, params.IMAGE_TYPE)
           createArchive(params.IMAGE_TYPE, env.IMG_OUTPUT_DIR)
-          yoctocommon.archiveImages(env.IMG_OUTPUT_DIR)
+          yoctocommon.archiveImages(env.IMG_OUTPUT_DIR, params.IMAGE_TYPE)
         }
       }
       post {
diff --git a/Jenkinsfile_mmcImages b/Jenkinsfile_mmcImages
index 34c23c0..df9a500 100644
--- a/Jenkinsfile_mmcImages
+++ b/Jenkinsfile_mmcImages
@@ -83,7 +83,7 @@ pipeline {
           //   the bootloader is also built with the dev image, hence we combine it
           if((params.IMAGE_TYPE == 'bootloader') || (params.IMAGE_TYPE == 'dev')) {
             createBslPackage(env.IMG_OUTPUT_DIR)
-            yoctocommon.archiveImages(env.IMG_OUTPUT_DIR)
+            yoctocommon.archiveImages(env.IMG_OUTPUT_DIR, 'bootloader')
           }
 
           // archive an image package:
@@ -91,7 +91,7 @@ pipeline {
           if(params.IMAGE_TYPE != 'bootloader') {
             createImagePackage(params.IMAGE_TYPE, env.IMG_OUTPUT_DIR)
             archiveOSTreeArtifact(env.IMG_OUTPUT_DIR)
-            yoctocommon.archiveImages(env.IMG_OUTPUT_DIR)
+            yoctocommon.archiveImages(env.IMG_OUTPUT_DIR, params.IMAGE_TYPE)
           }
         }
       }