diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index ba0c8bb1b0dbfacdacf07a37f20a2009773b9d18..18a17ec6289f4d24f6824266e4aa8b3b5b24afb2 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -254,7 +254,7 @@ retrigger:
           TAG_NAME=${CI_COMMIT_TAG}
           AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
           AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
-          AZURE_PATH="${AZURE_PATH}/edgehog/"
+          AZURE_PATH="${AZURE_PATH}/edgehog"
         fi
       - |
          uboot_filename="seco_edgehog_"$PROCESSOR"_"$BOARD"_uboot_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz"
@@ -287,13 +287,15 @@ retrigger:
                                 --container-name $AZURE_CONTAINER_NAME \
                                 --file $BASE_DIRECTORY/$uboot_filename \
                                 --name $AZURE_PATH/$TAG_NAME/$uboot_filename 
-          
+
+         if [ ! -n "$CI_COMMIT_TAG" ]; then 
          az storage blob upload --account-name $AZURE_STORAGE_ACCOUNT \
                                 --sas-token $AZURE_STORAGE_SAS_TOKEN \
                                 --container-name $AZURE_CONTAINER_NAME \
                                 --file $BASE_DIRECTORY/$uboot_filename \
                                 --name $AZURE_PATH/$TAG_NAME/$uboot_filename_latest \
                                 --overwrite
+         fi
 
          echo "##################################################################"
          echo "########################  KERNEL  ################################"
@@ -324,13 +326,15 @@ retrigger:
                                 --container-name $AZURE_CONTAINER_NAME \
                                 --file $BASE_DIRECTORY/$kernel_filename \
                                 --name $AZURE_PATH/$TAG_NAME/$kernel_filename
-
+         
+         if [ ! -n "$CI_COMMIT_TAG" ]; then
          az storage blob upload --account-name $AZURE_STORAGE_ACCOUNT \
                                 --sas-token $AZURE_STORAGE_SAS_TOKEN \
                                 --container-name $AZURE_CONTAINER_NAME \
                                 --file $BASE_DIRECTORY/$kernel_filename \
                                 --name $AZURE_PATH/$TAG_NAME/$kernel_filename_latest \
                                 --overwrite
+         fi                
 
          # echo "##################################################################"
          # echo "######################  FILESYSTEM  ##############################"
@@ -344,12 +348,14 @@ retrigger:
          #                        --file $BASE_DIRECTORY/$filesystem_name \
          #                        --name $AZURE_PATH/$TAG_NAME/$filesystem_name 
 
+         # if [ ! -n "$CI_COMMIT_TAG" ]; then
          # az storage blob upload --account-name $AZURE_STORAGE_ACCOUNT \
          #                        --sas-token $AZURE_STORAGE_SAS_TOKEN \
          #                        --container-name $AZURE_CONTAINER_NAME \
          #                        --file $BASE_DIRECTORY/$filesystem_name \
          #                        --name $AZURE_PATH/$TAG_NAME/$filesystem_name_latest \
          #                        --overwrite
+         # fi
 
          echo "################################################################"
          echo "#######################  BMAP IMAGE  ###########################"
@@ -366,12 +372,14 @@ retrigger:
                                 --file $BASE_DIRECTORY/$image_name \
                                 --name $AZURE_PATH/$TAG_NAME/$image_name 
 
+         if [ ! -n "$CI_COMMIT_TAG" ]; then
          az storage blob upload --account-name $AZURE_STORAGE_ACCOUNT \
                                 --sas-token $AZURE_STORAGE_SAS_TOKEN \
                                 --container-name $AZURE_CONTAINER_NAME \
                                 --file $BASE_DIRECTORY/$image_name \
                                 --name $AZURE_PATH/$TAG_NAME/$image_name_latest \
                                 --overwrite
+         fi
 
          echo "################################################################"
          echo "#######################  BMAP FILE  ############################"
@@ -385,13 +393,15 @@ retrigger:
                                 --container-name $AZURE_CONTAINER_NAME \
                                 --file $BASE_DIRECTORY/$bmap_name \
                                 --name $AZURE_PATH/$TAG_NAME/$bmap_name 
-          
+         
+         if [ ! -n "$CI_COMMIT_TAG" ]; then
          az storage blob upload --account-name $AZURE_STORAGE_ACCOUNT \
                                 --sas-token $AZURE_STORAGE_SAS_TOKEN \
                                 --container-name $AZURE_CONTAINER_NAME \
                                 --file $BASE_DIRECTORY/$bmap_name \
                                 --name $AZURE_PATH/$TAG_NAME/$bmap_name_latest \
                                 --overwrite
+         fi
 
          echo "##################################################################"
          echo "#######################  BUNDLE FILE  ############################"
@@ -405,13 +415,15 @@ retrigger:
                                 --container-name $AZURE_CONTAINER_NAME \
                                 --file $BASE_DIRECTORY/$bundle_filename \
                                 --name $AZURE_PATH/$TAG_NAME/$bundle_filename 
-          
+         
+         if [ ! -n "$CI_COMMIT_TAG" ]; then
          az storage blob upload --account-name $AZURE_STORAGE_ACCOUNT \
                                 --sas-token $AZURE_STORAGE_SAS_TOKEN \
                                 --container-name $AZURE_CONTAINER_NAME \
                                 --file $BASE_DIRECTORY/$bundle_filename \
                                 --name $AZURE_PATH/$TAG_NAME/$bundle_filename_latest \
-                                --overwrite 
+                                --overwrite
+         fi 
 
  after_script:
      - |
@@ -443,17 +455,20 @@ retrigger:
 
         if [ "$CI_JOB_STATUS" == "success" ]; then
             echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$uboot_filename) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
-            echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$uboot_filename_latest) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
             echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$kernel_filename) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
-            echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$kernel_filename_latest) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
             # echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$filesystem_name) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
-            # echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$filesystem_name_latest) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
             echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$image_name) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
-            echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$image_name_latest) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
             echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$bmap_name) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
-            echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$bmap_name_latest) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
             echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$bundle_filename) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
-            echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$bundle_filename_latest) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
+
+            if [ ! -n "$CI_COMMIT_TAG" ]; then
+              echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$uboot_filename_latest) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
+              echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$kernel_filename_latest) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
+              # echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$filesystem_name_latest) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
+              echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$image_name_latest) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
+              echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$bmap_name_latest) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
+              echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$bundle_filename_latest) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
+            fi
         else
             echo -e "JOBS FAILED" >> Link_report_$BOARD.txt
         fi