diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index c0c844cd76c71c65bfbd468061da2be2afcd2c7c..0cfb4b733241d3031278a4d1d03da9c647adc318 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -275,11 +275,11 @@ retrigger:
          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"
-         bmap_name_latest="seco_"$PROCESSOR"_"$BOARD"_bmapfile-"${IMAGE_NAME}"_"$KERNEL"_"$TAG_NAME"_latest.rootfs.wic.bmap"
+         bmap_name_latest="seco_"$PROCESSOR"_"$BOARD"_bmapfile-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest.rootfs.wic.bmap"
          bundle_filename="seco_"$PROCESSOR"_"$BOARD"_edgehog-bundle_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".raucb"
          bundle_filename_latest="seco_"$PROCESSOR"_"$BOARD"_edgehog-bundle_"$KERNEL"_"$TAG_NAME"_latest.raucb"
         
-         if [[ "${$CI_JOB_NAME}" != *"embedded"* ]]; then
+         if [[ "${CI_JOB_NAME}" != *"embedded"* ]]; then
             case none in 
             *${UBOOT_FILE}*) echo "Not deploying U-Boot for this board since not present";;
             *              )
@@ -483,7 +483,7 @@ retrigger:
         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"
-        bmap_name_latest="seco_"$PROCESSOR"_"$BOARD"_bmapfile-"${IMAGE_NAME}"_"$KERNEL"_"$TAG_NAME"_latest.rootfs.wic.bmap"
+        bmap_name_latest="seco_"$PROCESSOR"_"$BOARD"_bmapfile-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest.rootfs.wic.bmap"
         bundle_filename="seco_"$PROCESSOR"_"$BOARD"_edgehog-bundle_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".raucb"
         bundle_filename_latest="seco_"$PROCESSOR"_"$BOARD"_edgehog-bundle_"$KERNEL"_"$TAG_NAME"_latest.raucb"