diff --git a/build-pipeline.yml b/build-pipeline.yml
index 81bbd3303c2e61880d6918d10bee40b53d29bd5d..0c8221e9fbe5cfd4e908832efda4843ae9a6d464 100644
--- a/build-pipeline.yml
+++ b/build-pipeline.yml
@@ -338,11 +338,6 @@ workflow:
     - cat ${link_report}
     - image_url=$(cat ${link_report} | grep 'seco.*'"${BOARD}"'.*image.*.wic.bz2')
     - echo ${image_url}
-    - |
-      if [ -n "$CUSTOM" ]; then
-        image_url="${image_url}?${AZURE_STORAGE_PRIVATE_SAS_TOKEN}"
-        echo "{image_url}"
-      fi
     - |
       echo "Submitting LAVA job .."
       python3 lava-test/scripts/submit_test.py \
diff --git a/scripts/generate_report.sh b/scripts/generate_report.sh
index 77554e9d7a0d617911a7284213fd5719aa528449..8deb87428efb6f51d45a7051c0f934f4c70d80cf 100644
--- a/scripts/generate_report.sh
+++ b/scripts/generate_report.sh
@@ -67,7 +67,7 @@ if [ "$CI_JOB_STATUS" == "success" ]; then
       url_filesystem=$(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$filesystem_name --output tsv | sed -E 's/\?s.*//')
       sas_image=$(az storage blob generate-sas --account-key $AZURE_STORAGE_KEY --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$image_name --permissions r --expiry "$expire_date" --output tsv)
       url_image=$(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$image_name --output tsv | sed -E 's/\?s.*//')
-      sas_bmap=$(az storage blob generate-sas --account-key $AZURE_STORAGE_KEY --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$image_name --permissions r --expiry "$expire_date" --output tsv)
+      sas_bmap=$(az storage blob generate-sas --account-key $AZURE_STORAGE_KEY --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$bmap_name --permissions r --expiry "$expire_date" --output tsv)
       url_bmap=$(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$bmap_name --output tsv | sed -E 's/\?s.*//')
 
       artifacts="bundle uboot kernel filesystem image bmap"