diff --git a/.pipelines/v2/templates/job-build-project.yml b/.pipelines/v2/templates/job-build-project.yml
index f5bb7300be..44f082a24a 100644
--- a/.pipelines/v2/templates/job-build-project.yml
+++ b/.pipelines/v2/templates/job-build-project.yml
@@ -456,12 +456,6 @@ jobs:
       Copy-Item src\gpo\assets\* "$(JobOutputDirectory)/gpo" -Recurse
     displayName: Stage GPO files
 
-  - ${{ if eq(parameters.publishArtifacts, true) }}:
-    - publish: $(JobOutputDirectory)
-      artifact: $(JobOutputArtifactName)
-      displayName: Publish all outputs
-      condition: always()
-
   # Running the tests may result in future jobs consuming artifacts out of this build
   - ${{ if eq(parameters.runTests, true) }}:
     - task: CopyFiles@2
@@ -471,17 +465,32 @@ jobs:
         contents: '$(BuildPlatform)/$(BuildConfiguration)/**/*'
         targetFolder: '$(JobOutputDirectory)\$(BuildPlatform)\$(BuildConfiguration)'
 
-    - task: CopyFiles@2
-      displayName: Stage entire build output
-      inputs:
-        sourceFolder: $(JobOutputDirectory)
-        contents: |-
-          **
-          !**\*.pdb
-          !**\*.lib
-        targetFolder: '$(JobOutputDirectory)\TestArtifacts'
-
-    - publish: $(JobOutputDirectory)\TestArtifacts
-      artifact: $(JobOutputArtifactName)-TestArtifacts
-      displayName: Publish all outputs for testing
+  - ${{ if eq(parameters.publishArtifacts, true) }}:
+    - publish: $(JobOutputDirectory)
+      artifact: $(JobOutputArtifactName)
+      displayName: Publish all outputs
       condition: always()
+
+  # # Running the tests may result in future jobs consuming artifacts out of this build
+  # - ${{ if eq(parameters.runTests, true) }}:
+  #   - task: CopyFiles@2
+  #     displayName: Stage entire build output
+  #     inputs:
+  #       sourceFolder: '$(Build.SourcesDirectory)'
+  #       contents: '$(BuildPlatform)/$(BuildConfiguration)/**/*'
+  #       targetFolder: '$(JobOutputDirectory)\$(BuildPlatform)\$(BuildConfiguration)'
+
+  #   - task: CopyFiles@2
+  #     displayName: Stage entire build output
+  #     inputs:
+  #       sourceFolder: $(JobOutputDirectory)
+  #       contents: |-
+  #         **
+  #         !**\*.pdb
+  #         !**\*.lib
+  #       targetFolder: '$(JobOutputDirectory)\TestArtifacts'
+
+  #   - publish: $(JobOutputDirectory)\TestArtifacts
+  #     artifact: $(JobOutputArtifactName)-TestArtifacts
+  #     displayName: Publish all outputs for testing
+  #     condition: always()
diff --git a/.pipelines/v2/templates/job-test-project.yml b/.pipelines/v2/templates/job-test-project.yml
index 6d67f42c96..4838945326 100644
--- a/.pipelines/v2/templates/job-test-project.yml
+++ b/.pipelines/v2/templates/job-test-project.yml
@@ -19,7 +19,7 @@ jobs:
     BuildPlatform: ${{ parameters.platform }}
     BuildConfiguration: ${{ parameters.configuration }}
     SrcPath: $(Build.Repository.LocalPath)
-    TestArtifactsName: build-${{ parameters.platform }}-${{ parameters.configuration }}${{ parameters.inputArtifactStem }}-TestArtifacts
+    TestArtifactsName: build-${{ parameters.platform }}-${{ parameters.configuration }}${{ parameters.inputArtifactStem }}
   pool:
     ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
       ${{ if ne(parameters.platform, 'ARM64') }}: