diff --git a/.azure/pipelines/azure-pipelines-build.yml b/.azure/pipelines/azure-pipelines-build.yml
index 94736abb..dff31931 100644
--- a/.azure/pipelines/azure-pipelines-build.yml
+++ b/.azure/pipelines/azure-pipelines-build.yml
@@ -28,8 +28,7 @@ stages:
       env:
         BUILD_ARTIFACTSTAGINGDIRECTORY: $(Build.ArtifactStagingDirectory)
         BUILD_BINARIESDIRECTORY: $(Build.BinariesDirectory)
-        BUILD_SOURCESDIRECTORY: $(Build.SourcesDirectory)
-        BUILD_PUBLISHDIRECTORY: "$(Build.BuildDirectory)/${{parameters.PublishFolder}}"
+        BUILD_PUBLISHDIRECTORY: "$(Agent.BuildDirectory)/${{parameters.PublishFolder}}"
       inputs:
         targetType: inline
         script: |
@@ -260,7 +259,7 @@ stages:
         BUILD_ARTIFACTSTAGINGDIRECTORY: $(Build.ArtifactStagingDirectory)
         BUILD_BINARIESDIRECTORY: $(Build.BinariesDirectory)
         BUILD_SOURCESDIRECTORY: $(Build.SourcesDirectory)
-        BUILD_PUBLISHDIRECTORY: "$(Build.BuildDirectory)/${{parameters.PublishFolder}}"
+        BUILD_PUBLISHDIRECTORY: "$(Agent.BuildDirectory)/${{parameters.PublishFolder}}"
       inputs:
         targetType: inline
         script: |
diff --git a/.azure/pipelines/azure-pipelines.yml b/.azure/pipelines/azure-pipelines.yml
index 45e8e203..19e9e7e3 100644
--- a/.azure/pipelines/azure-pipelines.yml
+++ b/.azure/pipelines/azure-pipelines.yml
@@ -93,7 +93,7 @@ stages:
                 BUILD_ARTIFACTSTAGINGDIRECTORY: $(Build.ArtifactStagingDirectory)
                 BUILD_BINARIESDIRECTORY: $(Build.BinariesDirectory)
                 BUILD_SOURCESDIRECTORY: $(Build.SourcesDirectory)
-                BUILD_PUBLISHDIRECTORY: "$(Build.BuildDirectory)/$(PublishFolder)"
+                BUILD_PUBLISHDIRECTORY: "$(Agent.BuildDirectory)/$(PublishFolder)"
               inputs:
                 targetType: inline
                 script: |
@@ -170,7 +170,7 @@ stages:
                 BUILD_ARTIFACTSTAGINGDIRECTORY: $(Build.ArtifactStagingDirectory)
                 BUILD_BINARIESDIRECTORY: $(Build.BinariesDirectory)
                 BUILD_SOURCESDIRECTORY: $(Build.SourcesDirectory)
-                BUILD_PUBLISHDIRECTORY: "$(Build.BuildDirectory)/$(PublishFolder)"
+                BUILD_PUBLISHDIRECTORY: "$(Agent.BuildDirectory)/$(PublishFolder)"
               inputs:
                 targetType: inline
                 script: |