diff --git a/boards/.c12.yml b/boards/.c12.yml
index 548c9db72c0706d74e011fb4add8ddf0f8eaf06f..ee5d1be299ba60cc55f264d06d204d804ac4d81a 100644
--- a/boards/.c12.yml
+++ b/boards/.c12.yml
@@ -20,7 +20,7 @@ deploy-edgehog-c12:
      artifacts: true
   variables: &deploy-edgehog-c12
       <<: *build-edgehog-c12
-      UBOOT_FILE: u-boot.bin
+      UBOOT_FILE: imx-boot
       KERNEL_FILE: Image
       AZURE_PATH: imx8/c12
 
diff --git a/boards/.c20.yml b/boards/.c20.yml
index 22f1a4f681878ebf289b260d2a62d4216c610331..36904bb187f42faacb65c8bf3b7df1aaa6408ea2 100644
--- a/boards/.c20.yml
+++ b/boards/.c20.yml
@@ -20,7 +20,7 @@ deploy-edgehog-c20:
      artifacts: true
   variables: &deploy-edgehog-c20
       <<: *build-edgehog-c20
-      UBOOT_FILE: u-boot.bin
+      UBOOT_FILE: imx-boot
       KERNEL_FILE: Image
       AZURE_PATH: imx8/c20
 
diff --git a/boards/.c26.yml b/boards/.c26.yml
index 2914717e34ba3ff24eb0268d4023abb598307d6c..8f3b4cdbe5e76f75ba4b728d6ec515426a32aa51 100644
--- a/boards/.c26.yml
+++ b/boards/.c26.yml
@@ -20,7 +20,7 @@ deploy-edgehog-c26:
      artifacts: true
   variables: &deploy-edgehog-c26
       <<: *build-edgehog-c26
-      UBOOT_FILE: u-boot.bin
+      UBOOT_FILE: imx-boot
       KERNEL_FILE: Image
       AZURE_PATH: imx8/c26
 
diff --git a/boards/.c31.yml b/boards/.c31.yml
index d01d0dbb74795e072b8da1a182a0f4e50614f947..7186f79ad8d8aaef370cceea05a4170e0028f197 100644
--- a/boards/.c31.yml
+++ b/boards/.c31.yml
@@ -21,7 +21,7 @@ deploy-edgehog-c31:
      artifacts: true
   variables: &deploy-edgehog-c31
       <<: *build-edgehog-c31
-      UBOOT_FILE: uboot.img
+      UBOOT_FILE: uboot.img trust.img idblock.img
       KERNEL_FILE: Image
       AZURE_PATH: rockchip/c31
 
diff --git a/boards/.c43.yml b/boards/.c43.yml
index 4f70430b43184256f4574bbe363eb9807ee5e2a2..a99e462df0dddda06c5f14c0fd85a72d1f4bc7cd 100644
--- a/boards/.c43.yml
+++ b/boards/.c43.yml
@@ -20,7 +20,7 @@ deploy-edgehog-c43:
      artifacts: true
   variables: &deploy-edgehog-c43
       <<: *build-edgehog-c43
-      UBOOT_FILE: u-boot.bin
+      UBOOT_FILE: imx-boot
       KERNEL_FILE: Image
       AZURE_PATH: imx8/c43
 
diff --git a/boards/.tanaro.yml b/boards/.tanaro.yml
index 4e890c13b7d5032c0bea5c16b2aa3d3bdcbafd62..4cfb54ef784998c093d91d125af2eac358b99779 100644
--- a/boards/.tanaro.yml
+++ b/boards/.tanaro.yml
@@ -20,7 +20,7 @@ deploy-edgehog-tanaro:
       artifacts: true
   variables: &deploy-edgehog-tanaro
     <<: *build-edgehog-tanaro
-    UBOOT_FILE: u-boot.bin
+    UBOOT_FILE: imx-boot
     KERNEL_FILE: Image
     AZURE_PATH: imx8/tanaro
 
diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index 217854b37a72e9ad50365e0cabc36786b20e6de3..cd83af43e8962eeee088021259fd0bb34474abbf 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -264,9 +264,11 @@ retrigger:
         if [ -n "$CI_COMMIT_TAG" ]; then
           TAG_NAME=${CI_COMMIT_TAG}
           DEPLOY_PATH=${TAG_NAME}
-          AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
-          AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
           AZURE_PATH="${AZURE_PATH}/edgehog"
+          if [ ! -n "$CUSTOM" ]; then
+            AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
+            AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
+          fi
         fi
       - sh scripts/artifacts_name.sh $TAG_NAME     \
                                      $DEPLOY_DATE
@@ -296,9 +298,11 @@ retrigger:
         if [ -n "$CI_COMMIT_TAG" ]; then
           TAG_NAME=${CI_COMMIT_TAG}
           DEPLOY_PATH=${TAG_NAME}
-          AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
-          AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
           AZURE_PATH="${AZURE_PATH}/edgehog"
+          if [ ! -n "$CUSTOM" ]; then
+            AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
+            AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
+          fi
         fi
 
         echo "##################################################################" >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
@@ -330,7 +334,7 @@ changelog:
     - send_notify
   allow_failure: true
   rules:
-    - *build_rule
+    - *schedule_tag_rule
   script: .gitlab-ci/scripts/changelog_generator.py
               --token=${GITBOT_TOKEN}
               --branch=${MASTER_BRANCH}
@@ -365,8 +369,10 @@ notify:
 
         if [ -n "$CI_COMMIT_TAG" ]; then
           TAG_NAME=${CI_COMMIT_TAG}
-          AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
-          AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
+          if [ ! -n "$CUSTOM" ]; then
+            AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
+            AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
+          fi
         else
           TAG_NAME=$(date +%Y%m%d)
         fi
diff --git a/scripts/deploy_artifacts.sh b/scripts/deploy_artifacts.sh
index 93c2d33b8a24d4aa5c27151d7a777f026c8afe3b..fc03aefe0ecadfaed8100329a80965389039a3eb 100644
--- a/scripts/deploy_artifacts.sh
+++ b/scripts/deploy_artifacts.sh
@@ -43,10 +43,13 @@ case none in
     #Compress the uboot package and create a tar.gz file
     echo $ART_PATH
     ls -la $ART_PATH
-    find $ART_PATH -iname $UBOOT_FILE -exec cp -L {} $BASE_DIRECTORY/ \;
-    echo "${UBOOT_FILE}"
-    ls -la
-    tar -czvf $BASE_DIRECTORY/$uboot_filename -C $BASE_DIRECTORY $UBOOT_FILE
+    uboot_dir="$BASE_DIRECTORY/seco-uboot"
+    mkdir -p $uboot_dir
+
+    for el in $UBOOT_FILE; do
+      find $ART_PATH -iname $el -exec cp -L {} $uboot_dir/ \;
+    done
+    tar -czvf $BASE_DIRECTORY/$uboot_filename -C $uboot_dir $(for el in ${UBOOT_FILE}; do echo $el; done)
     ls -la
 
     az storage blob upload --account-name $AZURE_STORAGE_ACCOUNT \