diff --git a/eng/pipelines/templates/download-artifact-step.yml b/eng/pipelines/templates/download-artifact-step.yml
index 2470db19de7..9cf4792855e 100644
--- a/eng/pipelines/templates/download-artifact-step.yml
+++ b/eng/pipelines/templates/download-artifact-step.yml
@@ -7,14 +7,12 @@ parameters:
 
 steps:
   # Download artifact
-  - task: DownloadBuildArtifacts@0
+  - task: DownloadPipelineArtifact@2
     displayName: 'Download ${{ parameters.displayName }}'
     inputs:
       buildType: current
-      downloadType: single
-      downloadPath: '$(Build.SourcesDirectory)/__download__'
       artifactName: '${{ parameters.artifactName }}'
-      checkDownloadedFiles: true
+      targetPath: '$(Build.SourcesDirectory)/__download__/${{ parameters.artifactName }}'
 
   # Unzip artifact
   - task: ExtractFiles@1
diff --git a/eng/pipelines/templates/download-specific-artifact-step.yml b/eng/pipelines/templates/download-specific-artifact-step.yml
index 9ccf241404a..7fadddf7212 100644
--- a/eng/pipelines/templates/download-specific-artifact-step.yml
+++ b/eng/pipelines/templates/download-specific-artifact-step.yml
@@ -11,18 +11,17 @@ parameters:
 
 steps:
   # Download artifact
-  - task: DownloadBuildArtifacts@0
+  - task: DownloadPipelineArtifact@2
     displayName: 'Download specific ${{ parameters.displayName }}'
     inputs:
       buildType: specific
       project: ${{ parameters.project }}
-      pipeline: ${{ parameters.pipeline }}
+      definition: ${{ parameters.pipeline }}
       buildVersionToDownload: specific
       branchName: ${{ parameters.branchName }}
-      buildId: ${{ parameters.buildId }}
-      downloadType: single
-      downloadPath: '$(Build.SourcesDirectory)/__download__'
+      pipelineId: ${{ parameters.buildId }}
       artifactName: '${{ parameters.artifactName }}'
+      targetPath: '$(Build.SourcesDirectory)/__download__/${{ parameters.artifactName }}'
 
   # Unzip artifact
   - task: ExtractFiles@1