diff --git a/build/azure-pipelines/darwin/product-build-darwin-test.yml b/build/azure-pipelines/darwin/product-build-darwin-test.yml
index 1eb387ae199..f62551d967e 100644
--- a/build/azure-pipelines/darwin/product-build-darwin-test.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin-test.yml
@@ -7,6 +7,8 @@ parameters:
     type: boolean
   - name: VSCODE_RUN_SMOKE_TESTS
     type: boolean
+  - name: VSCODE_TEST_ARTIFACT_NAME
+    type: string
 
 steps:
   - script: npm exec -- npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index 1691dff3231..bdd3f62b51a 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -9,6 +9,9 @@ parameters:
     type: boolean
   - name: VSCODE_RUN_SMOKE_TESTS
     type: boolean
+  - name: VSCODE_TEST_ARTIFACT_NAME
+    type: string
+    default: ""
 
 steps:
   - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
@@ -169,6 +172,7 @@ steps:
     - template: product-build-darwin-test.yml@self
       parameters:
         VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
+        VSCODE_TEST_ARTIFACT_NAME: ${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}
         VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }}
         VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
         VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }}
diff --git a/build/azure-pipelines/linux/product-build-linux-test.yml b/build/azure-pipelines/linux/product-build-linux-test.yml
index 6796339c738..4fa6434c551 100644
--- a/build/azure-pipelines/linux/product-build-linux-test.yml
+++ b/build/azure-pipelines/linux/product-build-linux-test.yml
@@ -7,6 +7,8 @@ parameters:
     type: boolean
   - name: VSCODE_RUN_SMOKE_TESTS
     type: boolean
+  - name: VSCODE_TEST_ARTIFACT_NAME
+    type: string
   - name: PUBLISH_TASK_NAME
     type: string
     default: PublishPipelineArtifact@0
@@ -201,12 +203,10 @@ steps:
     - task: ${{ parameters.PUBLISH_TASK_NAME }}
       inputs:
         targetPath: .build/crashes
-        ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-          artifactName: crash-dump-linux-$(VSCODE_ARCH)-integration-$(System.JobAttempt)
-        ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
-          artifactName: crash-dump-linux-$(VSCODE_ARCH)-smoke-$(System.JobAttempt)
-        ${{ else }}:
+        ${{ if eq(parameters.VSCODE_TEST_ARTIFACT_NAME, '') }}:
           artifactName: crash-dump-linux-$(VSCODE_ARCH)-$(System.JobAttempt)
+        ${{ else }}:
+          artifactName: crash-dump-linux-$(VSCODE_ARCH)-${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}-$(System.JobAttempt)
         sbomEnabled: false
       displayName: "Publish Crash Reports"
       continueOnError: true
@@ -217,12 +217,10 @@ steps:
     - task: ${{ parameters.PUBLISH_TASK_NAME }}
       inputs:
         targetPath: node_modules
-        ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-          artifactName: node-modules-linux-$(VSCODE_ARCH)-integration-$(System.JobAttempt)
-        ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
-          artifactName: node-modules-linux-$(VSCODE_ARCH)-smoke-$(System.JobAttempt)
-        ${{ else }}:
+        ${{ if eq(parameters.VSCODE_TEST_ARTIFACT_NAME, '') }}:
           artifactName: node-modules-linux-$(VSCODE_ARCH)-$(System.JobAttempt)
+        ${{ else }}:
+          artifactName: node-modules-linux-$(VSCODE_ARCH)-${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}-$(System.JobAttempt)
         sbomEnabled: false
       displayName: "Publish Node Modules"
       continueOnError: true
@@ -231,12 +229,10 @@ steps:
     - task: ${{ parameters.PUBLISH_TASK_NAME }}
       inputs:
         targetPath: .build/logs
-        ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-          artifactName: logs-linux-$(VSCODE_ARCH)-integration-$(System.JobAttempt)
-        ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
-          artifactName: logs-linux-$(VSCODE_ARCH)-smoke-$(System.JobAttempt)
-        ${{ else }}:
+        ${{ if eq(parameters.VSCODE_TEST_ARTIFACT_NAME, '') }}:
           artifactName: logs-linux-$(VSCODE_ARCH)-$(System.JobAttempt)
+        ${{ else }}:
+          artifactName: logs-linux-$(VSCODE_ARCH)-${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}-$(System.JobAttempt)
         sbomEnabled: false
       displayName: "Publish Log Files"
       continueOnError: true
diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index 7471979a3cc..dc0bbbc82ab 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -1,6 +1,8 @@
 parameters:
   - name: VSCODE_QUALITY
     type: string
+  - name: VSCODE_ARCH
+    type: string
   - name: VSCODE_CIBUILD
     type: boolean
   - name: VSCODE_RUN_UNIT_TESTS
@@ -9,8 +11,9 @@ parameters:
     type: boolean
   - name: VSCODE_RUN_SMOKE_TESTS
     type: boolean
-  - name: VSCODE_ARCH
+  - name: VSCODE_TEST_ARTIFACT_NAME
     type: string
+    default: ""
 
 steps:
   - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
@@ -293,6 +296,7 @@ steps:
         VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }}
         VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
         VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }}
+        VSCODE_TEST_ARTIFACT_NAME: ${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}
         ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
           PUBLISH_TASK_NAME: 1ES.PublishPipelineArtifact@1
 
diff --git a/build/azure-pipelines/product-build-pr.yml b/build/azure-pipelines/product-build-pr.yml
index 2d66ff3945d..c550ca07239 100644
--- a/build/azure-pipelines/product-build-pr.yml
+++ b/build/azure-pipelines/product-build-pr.yml
@@ -22,191 +22,142 @@ variables:
   - name: VSCODE_STEP_ON_IT
     value: false
 
-jobs:
+stages:
   - ${{ if ne(variables['VSCODE_CIBUILD'], true) }}:
-    - job: Compile
+    - stage: Compile
       displayName: Compile & Hygiene
-      pool: 1es-oss-ubuntu-22.04-x64
-      timeoutInMinutes: 30
-      variables:
-        VSCODE_ARCH: x64
-      steps:
-        - template: product-compile.yml@self
-          parameters:
-            VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+      dependsOn: []
+      jobs:
+      - job: Compile
+        displayName: Compile & Hygiene
+        pool: 1es-oss-ubuntu-22.04-x64
+        timeoutInMinutes: 30
+        variables:
+          VSCODE_ARCH: x64
+        steps:
+          - template: product-compile.yml@self
+            parameters:
+              VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
 
-    - job: Linuxx64UnitTest
-      displayName: Linux (Unit Tests)
-      pool: 1es-oss-ubuntu-22.04-x64
-      timeoutInMinutes: 30
-      variables:
-        VSCODE_ARCH: x64
-        NPM_ARCH: x64
-        DISPLAY: ":10"
-      steps:
-        - template: linux/product-build-linux.yml@self
-          parameters:
-            VSCODE_ARCH: x64
-            VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-            VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
-            VSCODE_RUN_UNIT_TESTS: true
-            VSCODE_RUN_INTEGRATION_TESTS: false
-            VSCODE_RUN_SMOKE_TESTS: false
+    - stage: Test
+      displayName: Test
+      dependsOn: []
+      jobs:
+      - job: Linuxx64UnitTest
+        displayName: Linux (Unit Tests)
+        pool: 1es-oss-ubuntu-22.04-x64
+        timeoutInMinutes: 30
+        variables:
+          VSCODE_ARCH: x64
+          NPM_ARCH: x64
+          DISPLAY: ":10"
+        steps:
+          - template: linux/product-build-linux.yml@self
+            parameters:
+              VSCODE_ARCH: x64
+              VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+              VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
+              VSCODE_RUN_UNIT_TESTS: true
+              VSCODE_RUN_INTEGRATION_TESTS: false
+              VSCODE_RUN_SMOKE_TESTS: false
 
-    - job: Linuxx64IntegrationTest
-      displayName: Linux (Integration Tests)
-      pool: 1es-oss-ubuntu-22.04-x64
-      timeoutInMinutes: 30
-      variables:
-        VSCODE_ARCH: x64
-        NPM_ARCH: x64
-        DISPLAY: ":10"
-      steps:
-        - template: linux/product-build-linux.yml@self
-          parameters:
-            VSCODE_ARCH: x64
-            VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-            VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
-            VSCODE_RUN_UNIT_TESTS: false
-            VSCODE_RUN_INTEGRATION_TESTS: true
-            VSCODE_RUN_SMOKE_TESTS: false
+      - job: LinuxCLI
+        displayName: Linux (CLI Unit Tests)
+        pool: 1es-oss-ubuntu-22.04-x64
+        timeoutInMinutes: 30
+        steps:
+          - template: cli/test.yml@self
 
-    - job: Linuxx64SmokeTest
-      displayName: Linux (Smoke Tests)
-      pool: 1es-oss-ubuntu-22.04-x64
-      timeoutInMinutes: 30
-      variables:
-        VSCODE_ARCH: x64
-        NPM_ARCH: x64
-        DISPLAY: ":10"
-      steps:
-        - template: linux/product-build-linux.yml@self
-          parameters:
-            VSCODE_ARCH: x64
-            VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-            VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
-            VSCODE_RUN_UNIT_TESTS: false
-            VSCODE_RUN_INTEGRATION_TESTS: false
-            VSCODE_RUN_SMOKE_TESTS: true
+      - job: Linuxx64IntegrationTest
+        displayName: Linux (Integration Tests)
+        pool: 1es-oss-ubuntu-22.04-x64
+        timeoutInMinutes: 30
+        variables:
+          VSCODE_ARCH: x64
+          NPM_ARCH: x64
+          DISPLAY: ":10"
+        steps:
+          - template: linux/product-build-linux.yml@self
+            parameters:
+              VSCODE_ARCH: x64
+              VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+              VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
+              VSCODE_TEST_ARTIFACT_NAME: integration
+              VSCODE_RUN_UNIT_TESTS: false
+              VSCODE_RUN_INTEGRATION_TESTS: true
+              VSCODE_RUN_SMOKE_TESTS: false
 
-    - job: LinuxCLI
-      displayName: Linux (CLI)
-      pool: 1es-oss-ubuntu-22.04-x64
-      timeoutInMinutes: 30
-      steps:
-        - template: cli/test.yml@self
+      - job: Linuxx64SmokeTest
+        displayName: Linux (Smoke Tests)
+        pool: 1es-oss-ubuntu-22.04-x64
+        timeoutInMinutes: 30
+        variables:
+          VSCODE_ARCH: x64
+          NPM_ARCH: x64
+          DISPLAY: ":10"
+        steps:
+          - template: linux/product-build-linux.yml@self
+            parameters:
+              VSCODE_ARCH: x64
+              VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+              VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
+              VSCODE_TEST_ARTIFACT_NAME: smoke
+              VSCODE_RUN_UNIT_TESTS: false
+              VSCODE_RUN_INTEGRATION_TESTS: false
+              VSCODE_RUN_SMOKE_TESTS: true
 
-    - job: Windowsx64UnitTests
-      displayName: Windows (Unit Tests)
-      pool: 1es-oss-windows-2022-x64
-      timeoutInMinutes: 30
-      variables:
-        VSCODE_ARCH: x64
-        NPM_ARCH: x64
-      steps:
-        - template: win32/product-build-win32.yml@self
-          parameters:
-            VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-            VSCODE_ARCH: x64
-            VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
-            VSCODE_RUN_UNIT_TESTS: true
-            VSCODE_RUN_INTEGRATION_TESTS: false
-            VSCODE_RUN_SMOKE_TESTS: false
+      - job: Windowsx64UnitTests
+        displayName: Windows (Unit Tests)
+        pool: 1es-oss-windows-2022-x64
+        timeoutInMinutes: 30
+        variables:
+          VSCODE_ARCH: x64
+          NPM_ARCH: x64
+        steps:
+          - template: win32/product-build-win32.yml@self
+            parameters:
+              VSCODE_ARCH: x64
+              VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+              VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
+              VSCODE_RUN_UNIT_TESTS: true
+              VSCODE_RUN_INTEGRATION_TESTS: false
+              VSCODE_RUN_SMOKE_TESTS: false
 
-    - job: Windowsx64IntegrationTests
-      displayName: Windows (Integration Tests)
-      pool: 1es-oss-windows-2022-x64
-      timeoutInMinutes: 60
-      variables:
-        VSCODE_ARCH: x64
-        NPM_ARCH: x64
-      steps:
-        - template: win32/product-build-win32.yml@self
-          parameters:
-            VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-            VSCODE_ARCH: x64
-            VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
-            VSCODE_RUN_UNIT_TESTS: false
-            VSCODE_RUN_INTEGRATION_TESTS: true
-            VSCODE_RUN_SMOKE_TESTS: false
-
-    # - job: Windowsx64SmokeTests
-    #   displayName: Windows (Smoke Tests)
-    #   pool: 1es-oss-windows-2022-x64
-    #   timeoutInMinutes: 30
-    #   variables:
-    #     VSCODE_ARCH: x64
-    #     NPM_ARCH: x64
-    #   steps:
-    #     - template: win32/product-build-win32.yml@self
-    #       parameters:
-    #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-    #         VSCODE_ARCH: x64
-    #         VSCODE_RUN_UNIT_TESTS: false
-    #         VSCODE_RUN_INTEGRATION_TESTS: false
-    #         VSCODE_RUN_SMOKE_TESTS: true
+      - job: Windowsx64IntegrationTests
+        displayName: Windows (Integration Tests)
+        pool: 1es-oss-windows-2022-x64
+        timeoutInMinutes: 60
+        variables:
+          VSCODE_ARCH: x64
+          NPM_ARCH: x64
+        steps:
+          - template: win32/product-build-win32.yml@self
+            parameters:
+              VSCODE_ARCH: x64
+              VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+              VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
+              VSCODE_TEST_ARTIFACT_NAME: integration
+              VSCODE_RUN_UNIT_TESTS: false
+              VSCODE_RUN_INTEGRATION_TESTS: true
+              VSCODE_RUN_SMOKE_TESTS: false
 
   - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
-    - job: Linuxx64MaintainNodeModulesCache
-      displayName: Linux (Maintain node_modules cache)
-      pool: 1es-oss-ubuntu-22.04-x64
-      timeoutInMinutes: 30
-      variables:
-        VSCODE_ARCH: x64
-      steps:
-        - template: oss/product-build-pr-cache-linux.yml@self
+    - stage: NodeModuleCache
+      jobs:
+      - job: Linuxx64MaintainNodeModulesCache
+        displayName: Linux (Maintain node_modules cache)
+        pool: 1es-oss-ubuntu-22.04-x64
+        timeoutInMinutes: 30
+        variables:
+          VSCODE_ARCH: x64
+        steps:
+          - template: oss/product-build-pr-cache-linux.yml@self
 
-    - job: Windowsx64MaintainNodeModulesCache
-      displayName: Windows (Maintain node_modules cache)
-      pool: 1es-oss-windows-2022-x64
-      timeoutInMinutes: 30
-      variables:
-        VSCODE_ARCH: x64
-      steps:
-        - template: oss/product-build-pr-cache-win32.yml@self
-
-  # - job: macOSUnitTest
-  #   displayName: macOS (Unit Tests)
-  #   pool:
-  #     vmImage: macOS-11
-  #   timeoutInMinutes: 60
-  #   variables:
-  #     BUILDSECMON_OPT_IN: true
-  #     VSCODE_ARCH: x64
-  #   steps:
-  #     - template: darwin/product-build-darwin.yml@self
-  #       parameters:
-  #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-  #         VSCODE_RUN_UNIT_TESTS: true
-  #         VSCODE_RUN_INTEGRATION_TESTS: false
-  #         VSCODE_RUN_SMOKE_TESTS: false
-  # - job: macOSIntegrationTest
-  #   displayName: macOS (Integration Tests)
-  #   pool:
-  #     vmImage: macOS-11
-  #   timeoutInMinutes: 60
-  #   variables:
-  #     BUILDSECMON_OPT_IN: true
-  #     VSCODE_ARCH: x64
-  #   steps:
-  #     - template: darwin/product-build-darwin.yml@self
-  #       parameters:
-  #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-  #         VSCODE_RUN_UNIT_TESTS: false
-  #         VSCODE_RUN_INTEGRATION_TESTS: true
-  #         VSCODE_RUN_SMOKE_TESTS: false
-  # - job: macOSSmokeTest
-  #   displayName: macOS (Smoke Tests)
-  #   pool:
-  #     vmImage: macOS-11
-  #   timeoutInMinutes: 60
-  #   variables:
-  #     BUILDSECMON_OPT_IN: true
-  #     VSCODE_ARCH: x64
-  #   steps:
-  #     - template: darwin/product-build-darwin.yml@self
-  #       parameters:
-  #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-  #         VSCODE_RUN_UNIT_TESTS: false
-  #         VSCODE_RUN_INTEGRATION_TESTS: false
-  #         VSCODE_RUN_SMOKE_TESTS: true
+      - job: Windowsx64MaintainNodeModulesCache
+        displayName: Windows (Maintain node_modules cache)
+        pool: 1es-oss-windows-2022-x64
+        timeoutInMinutes: 30
+        variables:
+          VSCODE_ARCH: x64
+        steps:
+          - template: oss/product-build-pr-cache-win32.yml@self
diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index 7098749bbc6..5546242e46f 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -363,6 +363,7 @@ extends:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
                       VSCODE_ARCH: x64
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
+                      VSCODE_TEST_ARTIFACT_NAME: integration
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: true
                       VSCODE_RUN_SMOKE_TESTS: false
@@ -377,6 +378,7 @@ extends:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
                       VSCODE_ARCH: x64
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
+                      VSCODE_TEST_ARTIFACT_NAME: smoke
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: false
                       VSCODE_RUN_SMOKE_TESTS: true
@@ -466,6 +468,7 @@ extends:
                       VSCODE_ARCH: x64
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
+                      VSCODE_TEST_ARTIFACT_NAME: integration
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: true
                       VSCODE_RUN_SMOKE_TESTS: false
@@ -481,6 +484,7 @@ extends:
                       VSCODE_ARCH: x64
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
+                      VSCODE_TEST_ARTIFACT_NAME: smoke
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: false
                       VSCODE_RUN_SMOKE_TESTS: true
@@ -610,6 +614,7 @@ extends:
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
+                      VSCODE_TEST_ARTIFACT_NAME: integration
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: true
                       VSCODE_RUN_SMOKE_TESTS: false
@@ -623,6 +628,7 @@ extends:
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
+                      VSCODE_TEST_ARTIFACT_NAME: smoke
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: false
                       VSCODE_RUN_SMOKE_TESTS: true
diff --git a/build/azure-pipelines/win32/product-build-win32-test.yml b/build/azure-pipelines/win32/product-build-win32-test.yml
index ebc59303455..4ad894d721f 100644
--- a/build/azure-pipelines/win32/product-build-win32-test.yml
+++ b/build/azure-pipelines/win32/product-build-win32-test.yml
@@ -9,6 +9,8 @@ parameters:
     type: boolean
   - name: VSCODE_RUN_SMOKE_TESTS
     type: boolean
+  - name: VSCODE_TEST_ARTIFACT_NAME
+    type: string
   - name: PUBLISH_TASK_NAME
     type: string
     default: PublishPipelineArtifact@0
@@ -175,12 +177,10 @@ steps:
     - task: ${{ parameters.PUBLISH_TASK_NAME }}
       inputs:
         targetPath: .build\crashes
-        ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-          artifactName: crash-dump-windows-$(VSCODE_ARCH)-integration-$(System.JobAttempt)
-        ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
-          artifactName: crash-dump-windows-$(VSCODE_ARCH)-smoke-$(System.JobAttempt)
-        ${{ else }}:
+        ${{ if eq(parameters.VSCODE_TEST_ARTIFACT_NAME, '') }}:
           artifactName: crash-dump-windows-$(VSCODE_ARCH)-$(System.JobAttempt)
+        ${{ else }}:
+          artifactName: crash-dump-windows-$(VSCODE_ARCH)-${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}-$(System.JobAttempt)
         sbomEnabled: false
       displayName: "Publish Crash Reports"
       continueOnError: true
@@ -191,12 +191,10 @@ steps:
     - task: ${{ parameters.PUBLISH_TASK_NAME }}
       inputs:
         targetPath: node_modules
-        ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-          artifactName: node-modules-windows-$(VSCODE_ARCH)-integration-$(System.JobAttempt)
-        ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
-          artifactName: node-modules-windows-$(VSCODE_ARCH)-smoke-$(System.JobAttempt)
-        ${{ else }}:
+        ${{ if eq(parameters.VSCODE_TEST_ARTIFACT_NAME, '') }}:
           artifactName: node-modules-windows-$(VSCODE_ARCH)-$(System.JobAttempt)
+        ${{ else }}:
+          artifactName: node-modules-windows-$(VSCODE_ARCH)-${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}-$(System.JobAttempt)
         sbomEnabled: false
       displayName: "Publish Node Modules"
       continueOnError: true
@@ -205,12 +203,10 @@ steps:
     - task: ${{ parameters.PUBLISH_TASK_NAME }}
       inputs:
         targetPath: .build\logs
-        ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-          artifactName: logs-windows-$(VSCODE_ARCH)-integration-$(System.JobAttempt)
-        ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
-          artifactName: logs-windows-$(VSCODE_ARCH)-smoke-$(System.JobAttempt)
-        ${{ else }}:
+        ${{ if eq(parameters.VSCODE_TEST_ARTIFACT_NAME, '') }}:
           artifactName: logs-windows-$(VSCODE_ARCH)-$(System.JobAttempt)
+        ${{ else }}:
+          artifactName: logs-windows-$(VSCODE_ARCH)-${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}-$(System.JobAttempt)
         sbomEnabled: false
       displayName: "Publish Log Files"
       continueOnError: true
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index 56bcf7a6388..20162e18e09 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -11,6 +11,9 @@ parameters:
     type: boolean
   - name: VSCODE_RUN_SMOKE_TESTS
     type: boolean
+  - name: VSCODE_TEST_ARTIFACT_NAME
+    type: string
+    default: ""
 
 steps:
   - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
@@ -179,6 +182,7 @@ steps:
         VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }}
         VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
         VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }}
+        VSCODE_TEST_ARTIFACT_NAME: ${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}
         ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
           PUBLISH_TASK_NAME: 1ES.PublishPipelineArtifact@1