diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index f31ff80b8f4d830e2a22dccfced3e33340250e5e..e622bbe83d4e7ec7ed86a0b70d10782f15de79ab 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -312,8 +312,8 @@ retrigger:
         DEPLOY_DATE=$(date +%Y%m%d)
 
         if [ -n "$CUSTOM" ]; then
-            AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PRIVATE_SAS_TOKEN}"
-            AZURE_CONTAINER_NAME="${AZURE_PRIVATE_CONTAINER_NAME}"
+          AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PRIVATE_SAS_TOKEN}"
+          AZURE_CONTAINER_NAME="${AZURE_PRIVATE_CONTAINER_NAME}"
         fi
         if [ -n "$CI_COMMIT_TAG" ]; then
           TAG_NAME=${CI_COMMIT_TAG}
@@ -322,6 +322,7 @@ retrigger:
           if [ ! -n "$CUSTOM" ]; then
             AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
             AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
+          fi
         fi
 
         echo "##################################################################" >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
@@ -401,6 +402,7 @@ notify:
           if [ ! -n "$CUSTOM" ]; then
             AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
             AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
+          fi
         else
           TAG_NAME=$(date +%Y%m%d)
         fi