diff --git a/.pipelines/azure-pipelines-repd-build-variables.yml b/.pipelines/azure-pipelines-repd-build-variables.yml
index df1015dcbac0..d1475bcbb5e1 100644
--- a/.pipelines/azure-pipelines-repd-build-variables.yml
+++ b/.pipelines/azure-pipelines-repd-build-variables.yml
@@ -1,7 +1,7 @@
 variables:
   ${{ if eq(variables['Build.Reason'],'PullRequest') }}:
-    VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=$([[ "$(System.PullRequest.TargetBranch)" =~ ^refs/heads/internal-20[2-9][0-9]{3}$ ]] && echo deb,py2,py3,web,git,docker)'
+    VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=$([[ $(System.PullRequest.TargetBranch) =~ ^refs/heads/internal-20[2-9][0-9]{3}$ ]] && echo deb,py2,py3,web,git,docker || echo none)'
   ${{ elseif ne(variables['Build.SourceBranchName'],'internal') }}:
-    VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=$([[ "$(Build.SourceBranchName)" =~ ^internal-20[2-9][0-9]{3}$ ]] && echo deb,py2,py3,web,git,docker)'
+    VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=$([[ $(Build.SourceBranchName) =~ ^internal-20[2-9][0-9]{3}$ ]] && echo deb,py2,py3,web,git,docker || echo none)'
   ${{ else }}:
     VERSION_CONTROL_OPTIONS: ''