diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 9c7eeecf4..2ebd049bd 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -108,7 +108,7 @@ extends:
             buildArchitecture: x64
             additionalBuildParameters: '/p:PublishInternalAsset=true'
             runTests: true
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
 
         # Linux
         - template: eng/build.yml@self
@@ -120,7 +120,7 @@ extends:
             buildArchitecture: x64
             linuxPortable: true
             runTests: true
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -130,7 +130,7 @@ extends:
             buildArchitecture: x64
             linuxPortable: true
             runTests: true
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -140,7 +140,7 @@ extends:
             buildArchitecture: x64
             linuxPortable: false
             runTests: true
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -151,7 +151,7 @@ extends:
             additionalBuildParameters: '/p:BuildSdkDeb=true'
             linuxPortable: false
             runTests: true
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -162,7 +162,7 @@ extends:
             linuxPortable: true
             # Never run tests on arm64
             runTests: false
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -175,7 +175,7 @@ extends:
             additionalBuildParameters: '/p:HostOSName="linux-musl"'
             linuxPortable: false
             runTests: true
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -184,7 +184,7 @@ extends:
             buildArchitecture: x64
             linuxPortable: true
             runTests: true
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
 
         # MacOS
         - template: eng/build.yml@self
@@ -194,7 +194,7 @@ extends:
             buildConfiguration: Release
             buildArchitecture: x64
             runTests: true
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
 
       # Official/PGO instrumentation Builds
       - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
@@ -207,7 +207,7 @@ extends:
             buildArchitecture: x64
             additionalBuildParameters: '/p:PublishInternalAsset=true'
             runTests: false
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
         - template: eng/build.yml@self
           parameters:
             agentOs: Windows_NT
@@ -215,7 +215,7 @@ extends:
             buildConfiguration: Release
             buildArchitecture: x86
             runTests: false
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
         - template: eng/build.yml@self
           parameters:
             agentOs: Windows_NT
@@ -223,7 +223,7 @@ extends:
             buildConfiguration: Release
             buildArchitecture: arm64
             runTests: false
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
 
         # Linux
         - template: eng/build.yml@self
@@ -235,7 +235,7 @@ extends:
             runtimeIdentifier: 'linux-arm'
             linuxPortable: true
             runTests: false
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -245,7 +245,7 @@ extends:
             runtimeIdentifier: 'linux-arm64'
             linuxPortable: true
             runTests: false
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -257,7 +257,7 @@ extends:
             additionalBuildParameters: '/p:OSName="linux-musl"'
             linuxPortable: false
             runTests: false
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -268,7 +268,7 @@ extends:
             additionalBuildParameters: '/p:OSName="linux-musl"'
             linuxPortable: false
             runTests: false
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -281,7 +281,7 @@ extends:
             additionalBuildParameters: '/p:HostOSName="linux-musl"'
             linuxPortable: false
             runTests: false
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -294,7 +294,7 @@ extends:
             additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true'
             linuxPortable: true
             runTests: false
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -307,7 +307,7 @@ extends:
             additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true'
             linuxPortable: true
             runTests: false
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -321,7 +321,7 @@ extends:
             additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true  /p:IsRPMBasedDistro=true'
             linuxPortable: true
             runTests: false
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -330,7 +330,7 @@ extends:
             buildArchitecture: x64
             linuxPortable: true
             runTests: false
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
 
         # MacOS
         - template: eng/build.yml@self
@@ -340,7 +340,7 @@ extends:
             buildConfiguration: Release
             buildArchitecture: x64
             runTests: false
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
         - template: eng/build.yml@self
           parameters:
             agentOs: Darwin
@@ -349,7 +349,7 @@ extends:
             buildConfiguration: Release
             buildArchitecture: arm64
             runTests: false
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
 
         # Windows PGO Instrumentation
         - template: eng/build.yml@self
@@ -361,7 +361,7 @@ extends:
             buildArchitecture: x64
             additionalBuildParameters: '/p:PublishInternalAsset=true'
             runTests: false
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
         - template: eng/build.yml@self
           parameters:
             agentOs: Windows_NT
@@ -370,7 +370,7 @@ extends:
             buildConfiguration: Release
             buildArchitecture: x86
             runTests: false
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
         - template: eng/build.yml@self
           parameters:
             agentOs: Windows_NT
@@ -379,7 +379,7 @@ extends:
             buildConfiguration: Release
             buildArchitecture: arm64
             runTests: false
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
 
         # Linux PGO Instrumentation
         - template: eng/build.yml@self
@@ -391,7 +391,7 @@ extends:
             buildArchitecture: x64
             linuxPortable: true
             runTests: false
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -401,7 +401,7 @@ extends:
             buildArchitecture: arm64
             linuxPortable: true
             runTests: false
-            OneESPT: ${{ variables._OneESPT }}
+            OneESPT: $(_OneESPT)
 
         # Source Build
         - template: /eng/common/templates-official/jobs/source-build.yml@self