diff --git a/boards/.a62.yml b/boards/.a62.yml
index a77f0d8bfed56de2892c7b98827527a36a2af17e..f351a084c8d5aea5be4ce3e178255f6ffabcfc5b 100644
--- a/boards/.a62.yml
+++ b/boards/.a62.yml
@@ -11,6 +11,7 @@ build-edgehog-a62:
      MACHINE: seco-imx6qdl-a62
      DEFCONFIG_FILE: seco_sbc_a62_edgehog
      RECIPE_NAME: seco-image-edgehog
+     IMAGE_NAME: edgehog-things-image
     
 deploy-edgehog-a62:
   extends: .deploy
@@ -22,7 +23,6 @@ deploy-edgehog-a62:
       UBOOT_FILE: u-boot.imx
       KERNEL_FILE: zImage
       AZURE_PATH: imx6/a62
-      IMAGE_NAME: edgehog-things-image
 
 #############################
 ### EDGEHOG EMBEDDED BASE ###
@@ -35,6 +35,7 @@ build-edgehog-embedded-base-a62:
      RECIPE_NAME: seco-image-edgehog-base
      BUILD_DIRECTORY: build_a62_embedded_wayland
      DEFCONFIG_FILE: seco_sbc_a62_edgehog_embedded_wayland
+     IMAGE_NAME: edgehog-embedded-base-image
     
 deploy-edgehog-embedded-base-a62:
   extends: .deploy
@@ -44,7 +45,6 @@ deploy-edgehog-embedded-base-a62:
   variables:
       <<: *deploy-edgehog-a62
       <<: *build-edgehog-embedded-a62
-      IMAGE_NAME: edgehog-embedded-base-image
 
 #############################
 ### EDGEHOG EMBEDDED FULL ###
@@ -52,22 +52,16 @@ deploy-edgehog-embedded-base-a62:
 
 build-edgehog-embedded-full-a62:
   extends: .build
-  rules: &embedded_full
-    # Build only in case of a tag
-    - if: $CI_COMMIT_TAG
   variables: &build-edgehog-embedded-a62-full
      <<: *build-edgehog-embedded-a62
      RECIPE_NAME: seco-image-edgehog-full
+     IMAGE_NAME: edgehog-embedded-full-image
     
 deploy-edgehog-embedded-full-a62:
   extends: .deploy
-  rules: 
-    # Build only in case of a tag
-    - *embedded_full
   needs: 
    - job: build-edgehog-embedded-full-a62
      artifacts: true
   variables:
       <<: *deploy-edgehog-a62
-      <<: *build-edgehog-embedded-a62-full
-      IMAGE_NAME: edgehog-embedded-full-image
\ No newline at end of file
+      <<: *build-edgehog-embedded-a62-full
\ No newline at end of file
diff --git a/boards/.c20.yml b/boards/.c20.yml
index de69a618f37fb5f0842c3870d8608705e1eb6a32..22f1a4f681878ebf289b260d2a62d4216c610331 100644
--- a/boards/.c20.yml
+++ b/boards/.c20.yml
@@ -11,6 +11,7 @@ build-edgehog-c20:
      MACHINE: seco-imx8mq-c20
      DEFCONFIG_FILE: seco_sbc_c20_edgehog
      RECIPE_NAME: seco-image-edgehog
+     IMAGE_NAME: edgehog-things-image
 
 deploy-edgehog-c20:
   extends: .deploy
@@ -22,7 +23,6 @@ deploy-edgehog-c20:
       UBOOT_FILE: u-boot.bin
       KERNEL_FILE: Image
       AZURE_PATH: imx8/c20
-      IMAGE_NAME: edgehog-things-image
 
 #############################
 ### EDGEHOG EMBEDDED BASE ###
@@ -35,6 +35,7 @@ build-edgehog-embedded-base-c20:
      RECIPE_NAME: seco-image-edgehog-base
      BUILD_DIRECTORY: build_c20_embedded_wayland
      DEFCONFIG_FILE: seco_sbc_c20_edgehog_embedded_wayland
+     IMAGE_NAME: edgehog-embedded-base-image
     
 deploy-edgehog-embedded-base-c20:
   extends: .deploy
@@ -44,7 +45,6 @@ deploy-edgehog-embedded-base-c20:
   variables:
       <<: *deploy-edgehog-c20
       <<: *build-edgehog-embedded-c20
-      IMAGE_NAME: edgehog-embedded-base-image
 
 #############################
 ### EDGEHOG EMBEDDED FULL ###
@@ -52,22 +52,16 @@ deploy-edgehog-embedded-base-c20:
 
 build-edgehog-embedded-full-c20:
   extends: .build
-  rules: &embedded_full
-    # Build only in case of a tag
-    - if: $CI_COMMIT_TAG
   variables: &build-edgehog-embedded-c20-full
      <<: *build-edgehog-embedded-c20
      RECIPE_NAME: seco-image-edgehog-full
+     IMAGE_NAME: edgehog-embedded-full-image
     
 deploy-edgehog-embedded-full-c20:
   extends: .deploy
-  rules: 
-    # Build only in case of a tag
-    - *embedded_full
   needs: 
    - job: build-edgehog-embedded-full-c20
      artifacts: true
   variables:
       <<: *deploy-edgehog-c20
-      <<: *build-edgehog-embedded-c20-full
-      IMAGE_NAME: edgehog-embedded-full-image
\ No newline at end of file
+      <<: *build-edgehog-embedded-c20-full
\ No newline at end of file
diff --git a/boards/.c31.yml b/boards/.c31.yml
index 123ca9ced24f70771af7cb748d33b22f73abb3b6..79655158172fe95166cb579eeb39d30066c146d8 100644
--- a/boards/.c31.yml
+++ b/boards/.c31.yml
@@ -11,6 +11,7 @@ build-edgehog-c31:
      MACHINE: seco-rk3399-c31
      DEFCONFIG_FILE: seco_sbc_c31_edgehog
      RECIPE_NAME: seco-image-edgehog
+     IMAGE_NAME: edgehog-things-image
      
 deploy-edgehog-c31:
   extends: .deploy
@@ -22,7 +23,6 @@ deploy-edgehog-c31:
       UBOOT_FILE: uboot.img
       KERNEL_FILE: Image
       AZURE_PATH: rockchip/c31
-      IMAGE_NAME: edgehog-things-image
 
 #############################
 ### EDGEHOG EMBEDDED BASE ###
@@ -35,6 +35,7 @@ build-edgehog-embedded-base-c31:
      RECIPE_NAME: seco-image-edgehog-base
      BUILD_DIRECTORY: build_c31_embedded_wayland
      DEFCONFIG_FILE: seco_sbc_c31_edgehog_embedded_wayland
+     IMAGE_NAME: edgehog-embedded-base-image
     
 deploy-edgehog-embedded-base-c31:
   extends: .deploy
@@ -44,7 +45,6 @@ deploy-edgehog-embedded-base-c31:
   variables:
       <<: *deploy-edgehog-c31
       <<: *build-edgehog-embedded-c31
-      IMAGE_NAME: edgehog-embedded-base-image
 
 #############################
 ### EDGEHOG EMBEDDED FULL ###
@@ -52,22 +52,16 @@ deploy-edgehog-embedded-base-c31:
 
 build-edgehog-embedded-full-c31:
   extends: .build
-  rules: &embedded_full
-    # Build only in case of a tag
-    - if: $CI_COMMIT_TAG
   variables: &build-edgehog-embedded-c31-full
      <<: *build-edgehog-embedded-c31
      RECIPE_NAME: seco-image-edgehog-full
+     IMAGE_NAME: edgehog-embedded-full-image
 
 deploy-edgehog-embedded-full-c31:
   extends: .deploy
-  rules: 
-    # Build only in case of a tag
-    - *embedded_full
   needs: 
    - job: build-edgehog-embedded-full-c31
      artifacts: true
   variables:
       <<: *deploy-edgehog-c31
-      <<: *build-edgehog-embedded-c31-full
-      IMAGE_NAME: edgehog-embedded-full-image
\ No newline at end of file
+      <<: *build-edgehog-embedded-c31-full
\ No newline at end of file
diff --git a/boards/.intel_apl.yml b/boards/.intel_apl.yml
index 9a0e273507aad02bb65b2f504dce4ef4166457cf..4862f818f3c4d3bd33e8ad0b5279a93911c46046 100644
--- a/boards/.intel_apl.yml
+++ b/boards/.intel_apl.yml
@@ -11,6 +11,7 @@ build-edgehog-intel-apl:
      MACHINE: seco-intel-apl
      DEFCONFIG_FILE: seco_intel_apl_edgehog
      RECIPE_NAME: seco-image-edgehog
+     IMAGE_NAME: edgehog-things-image
     
 deploy-edgehog-intel-apl:
   extends: .deploy
@@ -21,5 +22,4 @@ deploy-edgehog-intel-apl:
       <<: *build-edgehog-intel-apl
       UBOOT_FILE: none
       KERNEL_FILE: none
-      AZURE_PATH: apollolake/Yocto
-      IMAGE_NAME: edgehog-things-image
\ No newline at end of file
+      AZURE_PATH: apollolake/Yocto
\ No newline at end of file
diff --git a/boards/.tanaro.yml b/boards/.tanaro.yml
index c0ddfe3280da2e205c34f9ef3daaf40e1b47997c..4e890c13b7d5032c0bea5c16b2aa3d3bdcbafd62 100644
--- a/boards/.tanaro.yml
+++ b/boards/.tanaro.yml
@@ -11,6 +11,7 @@ build-edgehog-tanaro:
     MACHINE: seco-imx8mm-tanaro
     DEFCONFIG_FILE: seco_sbc_tanaro_edgehog
     RECIPE_NAME: seco-image-edgehog
+    IMAGE_NAME: edgehog-things-image
     
 deploy-edgehog-tanaro:
   extends: .deploy
@@ -22,7 +23,6 @@ deploy-edgehog-tanaro:
     UBOOT_FILE: u-boot.bin
     KERNEL_FILE: Image
     AZURE_PATH: imx8/tanaro
-    IMAGE_NAME: edgehog-things-image
 
 #############################
 ### EDGEHOG EMBEDDED BASE ###
@@ -35,6 +35,7 @@ build-edgehog-embedded-base-tanaro:
      RECIPE_NAME: seco-image-edgehog-base
      BUILD_DIRECTORY: build_tanaro_embedded_wayland
      DEFCONFIG_FILE: seco_sbc_tanaro_edgehog_embedded_wayland
+     IMAGE_NAME: edgehog-embedded-base-image
     
 deploy-edgehog-embedded-base-tanaro:
   extends: .deploy
@@ -44,7 +45,6 @@ deploy-edgehog-embedded-base-tanaro:
   variables:
       <<: *deploy-edgehog-tanaro
       <<: *build-edgehog-embedded-tanaro
-      IMAGE_NAME: edgehog-embedded-base-image
 
 #############################
 ### EDGEHOG EMBEDDED FULL ###
@@ -52,22 +52,16 @@ deploy-edgehog-embedded-base-tanaro:
 
 build-edgehog-embedded-full-tanaro:
   extends: .build
-  rules: &embedded_full
-    # Build only in case of a tag
-    - if: $CI_COMMIT_TAG
   variables: &build-edgehog-embedded-tanaro-full
      <<: *build-edgehog-embedded-tanaro
      RECIPE_NAME: seco-image-edgehog-full
+     IMAGE_NAME: edgehog-embedded-full-image
     
 deploy-edgehog-embedded-full-tanaro:
   extends: .deploy
-  rules: 
-    # Build only in case of a tag
-    - *embedded_full
   needs: 
    - job: build-edgehog-embedded-full-tanaro
      artifacts: true
   variables:
       <<: *deploy-edgehog-tanaro
-      <<: *build-edgehog-embedded-tanaro-full
-      IMAGE_NAME: edgehog-embedded-full-image
\ No newline at end of file
+      <<: *build-edgehog-embedded-tanaro-full
\ No newline at end of file
diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index d64720c7e258dbde4aa547fc4f00be69bb07aba6..d7f841f87790965877d567d0c3edb09c1bacdeb0 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -27,7 +27,7 @@ variables:
   BUILD_TIMEOUT: 6h
   IMAGES_PATH: "tmp/deploy/images"
   TAG_NAME: weekly
-  KERNEL: 5-10-52
+  KERNEL: 5-10-x
   GIT_SSL_NO_VERIFY: 1
   FS_EXTENSION: rootfs.tar.bz2
   IMAGE_EXTENSION: wic.bz2
@@ -197,6 +197,7 @@ retrigger:
          echo "This is the manifest branch used for the build: ${BUILD_BRANCH}"
          echo "This is the board for which the build will be performed: ${BOARD}"
          echo "This is the bitbake recipe we will be using for the build: ${RECIPE_NAME}"
+         echo "This is the image name will be assigned to software artifacts: ${IMAGE_NAME}"
       - |
         su secous -c "
         repo init -u ${CI_REPOSITORY_URL} -b ${BUILD_BRANCH}; 
@@ -216,16 +217,16 @@ retrigger:
   
   after_script:
       - |
-        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
+        echo -e "### **"$BOARD"_"$IMAGE_NAME"**" >> Job_build_message_"$BOARD"_"$IMAGE_NAME".txt
+        echo "##################################################################" >> Job_build_report_"$BOARD"_"$IMAGE_NAME".txt
+        echo ""$BOARD"_"$IMAGE_NAME" JOB STATUS" >> Job_build_report_"$BOARD"_"$IMAGE_NAME".txt
+        echo "##################################################################" >> Job_build_report_"$BOARD"_"$IMAGE_NAME".txt
         if [ $CI_JOB_STATUS == "failed" ]; then
-            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
+            echo -e "$CI_JOB_NAME: \t\t FAILED" >> Job_build_message_"$BOARD"_"$IMAGE_NAME".txt
+            echo -e "$CI_JOB_NAME: \t \t FAILED" >> Job_build_report_"$BOARD"_"$IMAGE_NAME".txt
         else
-            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
+            echo -e "$CI_JOB_NAME: \t\t $CI_JOB_STATUS" >> Job_build_message_"$BOARD"_"$IMAGE_NAME".txt
+            echo -e "$CI_JOB_NAME \t \t $CI_JOB_STATUS" >> Job_build_report_"$BOARD"_"$IMAGE_NAME".txt
         fi
 
   artifacts:
@@ -233,8 +234,8 @@ retrigger:
      paths:
       - $BUILD_DIRECTORY/$IMAGES_PATH/$MACHINE/
       - pathname.txt
-      - Job_build_report_${BOARD}_${RECIPE_NAME}.txt
-      - Job_build_message_${BOARD}_${RECIPE_NAME}.txt
+      - Job_build_report_${BOARD}_${IMAGE_NAME}.txt
+      - Job_build_message_${BOARD}_${IMAGE_NAME}.txt
   allow_failure: true 
 
 #############################
@@ -261,11 +262,14 @@ retrigger:
       - echo "Deploying packages..."
       - echo "This is the board for which the build has been performed... ${BOARD}"
       - echo "This is the recipe name associated to that build... ${RECIPE_NAME}"
+      - echo "This is the image name will be assigned to software artifacts... ${IMAGE_NAME}"
       - ART_PATH=$(cat pathname.txt)
       - DEPLOY_DATE=$(date +%Y%m%d)
+      - DEPLOY_PATH="${TAG_NAME}/week_$(date +%U)"
       - |
         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"
@@ -305,7 +309,7 @@ retrigger:
                                                     --sas-token $AZURE_STORAGE_SAS_TOKEN \
                                                     --container-name $AZURE_CONTAINER_NAME \
                                                     --file $BASE_DIRECTORY/$uboot_filename \
-                                                    --name $AZURE_PATH/$TAG_NAME/$uboot_filename \
+                                                    --name $AZURE_PATH/$DEPLOY_PATH/$uboot_filename \
                                                     --overwrite
 
                              if [ ! -n "$CI_COMMIT_TAG" ]; then 
@@ -313,7 +317,7 @@ retrigger:
                                                       --sas-token $AZURE_STORAGE_SAS_TOKEN \
                                                       --container-name $AZURE_CONTAINER_NAME \
                                                       --file $BASE_DIRECTORY/$uboot_filename \
-                                                      --name $AZURE_PATH/$TAG_NAME/$uboot_filename_latest \
+                                                      --name $AZURE_PATH/$DEPLOY_PATH/$uboot_filename_latest \
                                                       --overwrite
                              fi
                              echo "Finishing U-Boot upload";;
@@ -350,7 +354,7 @@ retrigger:
                                                       --sas-token $AZURE_STORAGE_SAS_TOKEN \
                                                       --container-name $AZURE_CONTAINER_NAME \
                                                       --file $BASE_DIRECTORY/$kernel_filename \
-                                                      --name $AZURE_PATH/$TAG_NAME/$kernel_filename \
+                                                      --name $AZURE_PATH/$DEPLOY_PATH/$kernel_filename \
                                                       --overwrite
 
                                if [ ! -n "$CI_COMMIT_TAG" ]; then
@@ -358,7 +362,7 @@ retrigger:
                                                         --sas-token $AZURE_STORAGE_SAS_TOKEN \
                                                         --container-name $AZURE_CONTAINER_NAME \
                                                         --file $BASE_DIRECTORY/$kernel_filename \
-                                                        --name $AZURE_PATH/$TAG_NAME/$kernel_filename_latest \
+                                                        --name $AZURE_PATH/$DEPLOY_PATH/$kernel_filename_latest \
                                                         --overwrite
                                fi
                                echo "Finishing Kernel upload";;         
@@ -374,7 +378,7 @@ retrigger:
                                    --sas-token $AZURE_STORAGE_SAS_TOKEN \
                                    --container-name $AZURE_CONTAINER_NAME \
                                    --file $BASE_DIRECTORY/$filesystem_name \
-                                   --name $AZURE_PATH/$TAG_NAME/$filesystem_name \
+                                   --name $AZURE_PATH/$DEPLOY_PATH/$filesystem_name \
                                    --overwrite
 
             if [ ! -n "$CI_COMMIT_TAG" ]; then
@@ -382,7 +386,7 @@ retrigger:
                                      --sas-token $AZURE_STORAGE_SAS_TOKEN \
                                      --container-name $AZURE_CONTAINER_NAME \
                                      --file $BASE_DIRECTORY/$filesystem_name \
-                                     --name $AZURE_PATH/$TAG_NAME/$filesystem_name_latest \
+                                     --name $AZURE_PATH/$DEPLOY_PATH/$filesystem_name_latest \
                                      --overwrite
             fi
 
@@ -397,7 +401,7 @@ retrigger:
                                    --sas-token $AZURE_STORAGE_SAS_TOKEN \
                                    --container-name $AZURE_CONTAINER_NAME \
                                    --file $BASE_DIRECTORY/$bundle_filename \
-                                   --name $AZURE_PATH/$TAG_NAME/$bundle_filename \
+                                   --name $AZURE_PATH/$DEPLOY_PATH/$bundle_filename \
                                    --overwrite
 
             if [ ! -n "$CI_COMMIT_TAG" ]; then
@@ -405,7 +409,7 @@ retrigger:
                                     --sas-token $AZURE_STORAGE_SAS_TOKEN \
                                     --container-name $AZURE_CONTAINER_NAME \
                                     --file $BASE_DIRECTORY/$bundle_filename \
-                                    --name $AZURE_PATH/$TAG_NAME/$bundle_filename_latest \
+                                    --name $AZURE_PATH/$DEPLOY_PATH/$bundle_filename_latest \
                                     --overwrite
             fi
          fi   
@@ -423,7 +427,7 @@ retrigger:
                                 --sas-token $AZURE_STORAGE_SAS_TOKEN \
                                 --container-name $AZURE_CONTAINER_NAME \
                                 --file $BASE_DIRECTORY/$image_name \
-                                --name $AZURE_PATH/$TAG_NAME/$image_name \
+                                --name $AZURE_PATH/$DEPLOY_PATH/$image_name \
                                 --overwrite
 
          if [ ! -n "$CI_COMMIT_TAG" ]; then
@@ -431,7 +435,7 @@ retrigger:
                                  --sas-token $AZURE_STORAGE_SAS_TOKEN \
                                  --container-name $AZURE_CONTAINER_NAME \
                                  --file $BASE_DIRECTORY/$image_name \
-                                 --name $AZURE_PATH/$TAG_NAME/$image_name_latest \
+                                 --name $AZURE_PATH/$DEPLOY_PATH/$image_name_latest \
                                  --overwrite
          fi
 
@@ -446,7 +450,7 @@ retrigger:
                                 --sas-token $AZURE_STORAGE_SAS_TOKEN \
                                 --container-name $AZURE_CONTAINER_NAME \
                                 --file $BASE_DIRECTORY/$bmap_name \
-                                --name $AZURE_PATH/$TAG_NAME/$bmap_name \
+                                --name $AZURE_PATH/$DEPLOY_PATH/$bmap_name \
                                 --overwrite
          
          if [ ! -n "$CI_COMMIT_TAG" ]; then
@@ -454,35 +458,38 @@ retrigger:
                                  --sas-token $AZURE_STORAGE_SAS_TOKEN \
                                  --container-name $AZURE_CONTAINER_NAME \
                                  --file $BASE_DIRECTORY/$bmap_name \
-                                 --name $AZURE_PATH/$TAG_NAME/$bmap_name_latest \
+                                 --name $AZURE_PATH/$DEPLOY_PATH/$bmap_name_latest \
                                  --overwrite
          fi 
 
  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
+        mv Job_build_message_"$BOARD"_"$IMAGE_NAME".txt Job_message_"$BOARD"_"$IMAGE_NAME".txt
+        mv Job_build_report_"$BOARD"_"$IMAGE_NAME".txt Job_report_"$BOARD"_"$IMAGE_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_message_"$BOARD"_"$IMAGE_NAME".txt
+            echo -e "$CI_JOB_NAME: \t \t FAILED" >> Job_report_"$BOARD"_"$IMAGE_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 $CI_JOB_STATUS" >> Job_report_"$BOARD"_"$RECIPE_NAME".txt
+            echo -e "$CI_JOB_NAME: \t\t $CI_JOB_STATUS" >> Job_message_"$BOARD"_"$IMAGE_NAME".txt
+            echo -e "$CI_JOB_NAME \t $CI_JOB_STATUS" >> Job_report_"$BOARD"_"$IMAGE_NAME".txt
         fi
 
+        DEPLOY_PATH="${TAG_NAME}/week_$(date +%U)"
+        DEPLOY_DATE=$(date +%Y%m%d)
+
         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"
         fi
 
-        echo "##################################################################" >> Link_report_"$BOARD"_"$RECIPE_NAME".txt
-        echo ""$BOARD"_"$RECIPE_NAME" URLs" >> Link_report_"$BOARD"_"$RECIPE_NAME".txt
-        echo "##################################################################" >> Link_report_"$BOARD"_"$RECIPE_NAME".txt
+        echo "##################################################################" >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
+        echo ""$BOARD"_"$IMAGE_NAME" URLs" >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
+        echo "##################################################################" >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
 
-        DEPLOY_DATE=$(date +%Y%m%d)
         uboot_filename="seco_"$PROCESSOR"_"$BOARD"_uboot_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz"
         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"
@@ -498,33 +505,53 @@ retrigger:
 
         if [ "$CI_JOB_STATUS" == "success" ]; then
             if [[ "${CI_JOB_NAME}" != *"embedded"* ]]; 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"_"$RECIPE_NAME".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"_"$RECIPE_NAME".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"_"$RECIPE_NAME".txt
+
+              case none in 
+              *${UBOOT_FILE}*) echo "Not deployed U-Boot for this board since not present";;
+              *              )
+                               echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$uboot_filename) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$IMAGE_NAME".txt;;
+              esac
+
+              case none in 
+              *${KERNEL_FILE}*) echo "Not deployed Kernel for this board since not present";;
+              *               )
+                                echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$kernel_filename) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$IMAGE_NAME".txt;;
+
+              echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$bundle_filename) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
             fi
-            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"_"$RECIPE_NAME".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"_"$RECIPE_NAME".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"_"$RECIPE_NAME".txt
+            echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$filesystem_name) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
+            echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$image_name) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
+            echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$bmap_name) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
 
             if [ ! -n "$CI_COMMIT_TAG" ]; then
               if [[ "${CI_JOB_NAME}" != *"embedded"* ]]; 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"_"$RECIPE_NAME".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"_"$RECIPE_NAME".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"_"$RECIPE_NAME".txt
+                
+                case none in 
+                *${UBOOT_FILE}*) echo "Not deployed U-Boot for this board since not present";;
+                *              )
+                                 echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$uboot_filename_latest) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$IMAGE_NAME".txt;;
+                esac
+
+                case none in 
+                *${KERNEL_FILE}*) echo "Not deployed Kernel for this board since not present";;
+                *               )
+                                echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$kernel_filename_latest) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$IMAGE_NAME".txt;;
+                
+                echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$bundle_filename_latest) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
               fi
-              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"_"$RECIPE_NAME".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"_"$RECIPE_NAME".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"_"$RECIPE_NAME".txt
+              echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$filesystem_name_latest) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
+              echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$image_name_latest) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
+              echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$bmap_name_latest) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
             fi
         else
-            echo -e "JOBS FAILED" >> Link_report_"$BOARD"_"$RECIPE_NAME".txt
+            echo -e "JOBS FAILED" >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
         fi
  allow_failure: true
  artifacts:
    paths:
-    - Job_report_${BOARD}_${RECIPE_NAME}.txt
-    - Job_message_${BOARD}_${RECIPE_NAME}.txt
-    - Link_report_${BOARD}_${RECIPE_NAME}.txt
+    - Job_report_${BOARD}_${IMAGE_NAME}.txt
+    - Job_message_${BOARD}_${IMAGE_NAME}.txt
+    - Link_report_${BOARD}_${IMAGE_NAME}.txt
 
 #############################
 ####### CHANGE LOG ##########
@@ -667,6 +694,4 @@ release:
         echo $command >> release.sh
         cat release.sh
         chmod +x release.sh
-        sh release.sh
-
-
+        sh release.sh
\ No newline at end of file