diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index f582cd9eccc5d76588fb71a384639c316d91a058..78c8c249bdf210623f50b098d7d5c5706abe3ac4 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -325,10 +325,7 @@ retrigger:
      - |
         echo "Deploying software artifacts to Azure.."
         . .gitlab-ci/scripts/artifacts_name.sh $TAG_NAME $DEPLOY_DATE
-     - sh .gitlab-ci/scripts/generate_report.sh $DEPLOY_PATH     \
-                                                $AZURE_STORAGE_SAS_TOKEN  \
-                                                $AZURE_CONTAINER_NAME     \
-                                                $AZURE_PATH
+     - sh .gitlab-ci/scripts/generate_report.sh $DEPLOY_PATH  $AZURE_STORAGE_SAS_TOKEN  $AZURE_CONTAINER_NAME $AZURE_PATH
         
  allow_failure: true
  artifacts:
diff --git a/scripts/generate_report.sh b/scripts/generate_report.sh
index cd3e82cc609465830d6ef1fc1d1212252fb8d0ee..7a1bcda8dfad0f46cbbea4602056e1ad9810a9b8 100644
--- a/scripts/generate_report.sh
+++ b/scripts/generate_report.sh
@@ -6,7 +6,7 @@ AZURE_CONTAINER_NAME=$3
 AZURE_PATH=$4
 
 if [ "$CI_JOB_STATUS" == "success" ]; then
-    if [[ "${CI_JOB_NAME}" != *"embedded"* ]]; then
+    if [[ ! "${CI_JOB_NAME}" =~ "embedded" ]]; then
         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
     case none in
@@ -27,7 +27,7 @@ if [ "$CI_JOB_STATUS" == "success" ]; then
     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
+        if [[ ! "${CI_JOB_NAME}" =~ "embedded" ]]; then
             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