diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 7cd6b09946..300305948a 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -450,6 +450,10 @@ stages:
           testResultsFiles: '*.xml'
           searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Flaky'
       artifacts:
+      - name: Windows_Test_Dumps
+        path: artifacts/dumps/
+        publishOnError: true
+        includeForks: false
       - name: Windows_Test_Logs
         path: artifacts/log/
         publishOnError: true
@@ -474,6 +478,10 @@ stages:
       - script: ./src/ProjectTemplates/build.cmd -ci -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true /bl:artifacts/log/template.test.binlog"
         displayName: Test Templates
       artifacts:
+      - name: Windows_Test_Templates_Dumps
+        path: artifacts/dumps/
+        publishOnError: true
+        includeForks: false
       - name: Windows_Test_Templates_Logs
         path: artifacts/log/
         publishOnError: true
diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
index 5a829c68cf..a136f3871f 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.azure/pipelines/jobs/default-build.yml
@@ -129,7 +129,7 @@ jobs:
     - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isTestingJob, true)) }}:
       - powershell: ./eng/scripts/InstallProcDump.ps1
         displayName: Install ProcDump
-      - powershell: ./eng/scripts/StartDumpCollectionForHangingBuilds.ps1 $(ProcDumpPath)procdump.exe artifacts/log/ (Get-Date).AddMinutes(160) dotnet
+      - powershell: ./eng/scripts/StartDumpCollectionForHangingBuilds.ps1 $(ProcDumpPath)procdump.exe artifacts/dumps/ (Get-Date).AddMinutes(160) dotnet
         displayName: Start background dump collection
     - ${{ if eq(parameters.installNodeJs, 'true') }}:
       - task: NodeTool@0
@@ -171,7 +171,7 @@ jobs:
     - ${{ parameters.afterBuild }}
 
     - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isTestingJob, true)) }}:
-      - powershell: ./eng/scripts/FinishDumpCollectionForHangingBuilds.ps1 artifacts/log/
+      - powershell: ./eng/scripts/FinishDumpCollectionForHangingBuilds.ps1 artifacts/dumps/
         displayName: Finish background dump collection
         continueOnError: true
         condition: always()