diff --git a/build-pipeline.yml b/build-pipeline.yml
index 0c8221e9fbe5cfd4e908832efda4843ae9a6d464..2a3abc7bd64b870400330a323f4b2fa8430d9391 100644
--- a/build-pipeline.yml
+++ b/build-pipeline.yml
@@ -257,10 +257,11 @@ workflow:
            AZURE_CONTAINER_NAME="${AZURE_PRIVATE_CONTAINER_NAME}"
        fi
        if [ -n "$CI_COMMIT_TAG" ]; then
-         TAG_NAME=${CI_COMMIT_TAG}
+         TAG_NAME=${CUSTOM}_${CI_COMMIT_TAG}
          if [ ! -n "$CUSTOM" ]; then
            AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
            AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
+           TAG_NAME=${CI_COMMIT_TAG}
          fi
        else
          TAG_NAME=$(date +%Y%m%d)