diff --git a/build/azure-devops/buildimages.yaml b/build/azure-devops/buildimages.yaml
index 23e29540b..fc2a41e72 100644
--- a/build/azure-devops/buildimages.yaml
+++ b/build/azure-devops/buildimages.yaml
@@ -1,6 +1,8 @@
 parameters:
   services: ''
   registryEndpoint: ''
+  helmfrom: ''
+  helmto: ''
 
 jobs:
 - job: BuildContainersForPR_Linux
@@ -52,11 +54,11 @@ jobs:
         TAG=${{ variables['Build.SourceBranchName'] }} 
   - task: CopyFiles@2
     inputs:
-      sourceFolder: "${{ variables['Build.SourcesDirectory'] }}/k8s/helm"
-      targetFolder: "${{ variables['Build.ArtifactStagingDirectory'] }}/k8s/helm"
+      sourceFolder: ${{ parameters.helmfrom }}
+      targetFolder: ${{ parameters.helmto }}
   - task: PublishBuildArtifacts@1
     inputs:
-      pathtoPublish: "${{ variables['Build.ArtifactStagingDirectory'] }}/k8s/helm"
+      pathtoPublish: ${{ parameters.helmto }}
       artifactName: helm
 - job: BuildWindows
   condition: ne('${{ variables['Build.Reason'] }}', 'PullRequest')
diff --git a/build/azure-devops/catalog-api/azure-pipelines.yml b/build/azure-devops/catalog-api/azure-pipelines.yml
index 29a99292b..032d1dd2f 100644
--- a/build/azure-devops/catalog-api/azure-pipelines.yml
+++ b/build/azure-devops/catalog-api/azure-pipelines.yml
@@ -15,6 +15,8 @@ jobs:
   parameters:
     services: catalog.api
     registryEndpoint: $(registryEndpoint)
+    helmfrom: $(Build.SourcesDirectory)/k8s/helm
+    helmto: $(Build.ArtifactStagingDirectory)/k8s/helm
 - template: ../multiarch.yaml
   parameters:
     image: catalog.api