diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index 597b2741e6..2da2d698b9 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -103,11 +103,13 @@ extends:
       - template: /eng/common/templates-official/jobs/jobs.yml@self
         parameters:
           enableMicrobuild: true
-          enablePublishBuildArtifacts: true
           enablePublishTestResults: true
           testResultsFormat: 'vstest'
-          enablePublishBuildAssets: true
           enablePublishUsingPipelines: true
+          artifacts:
+            publish:
+              logs: true
+              manifests: true
           enableTelemetry: true
           jobs:
           - job: Windows
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c0d6ba49aa..0f2fe9f91a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -53,11 +53,14 @@ stages:
   - template: /eng/common/templates/jobs/jobs.yml
     parameters:
       enableMicrobuild: true
-      enablePublishBuildArtifacts: true
       enablePublishTestResults: true
       testResultsFormat: 'vstest'
-      enablePublishBuildAssets: true
       enablePublishUsingPipelines: true
+      artifacts:
+        publish:
+          artifacts: true
+          logs: true
+          manifests: true
       enableTelemetry: true
       jobs:
       - job: Windows
@@ -113,13 +116,6 @@ stages:
           name: Build
           displayName: Build
 
-        - task: PublishBuildArtifacts@1
-          displayName: 'Publish NuGet packages'
-          inputs:
-            PathtoPublish: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/Shipping'
-            ArtifactName: '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)'
-          condition: always()
-
         - ${{ if eq(parameters.SkipTests, False) }}:
 
           # Because the build step is using -ci flag, restore is done in a local .packages directory.
@@ -171,34 +167,6 @@ stages:
               ArtifactName: TestResults_Windows_$(_BuildConfig)
             condition: failed()
 
-      - job: WindowsSamples
-        timeoutInMinutes: 30
-        pool:
-          name: NetCore-Public
-          demands: ImageOverride -equals windows.vs2026preview.scout.amd64.open
-        strategy:
-          matrix:
-            Release:
-              _BuildConfig: Release
-            Debug:
-              _BuildConfig: Debug
-        steps:
-        - task: PowerShell@2
-          displayName: 'Install Windows SDK'
-          inputs:
-            targetType: filePath
-            filePath: './eng/install-windows-sdk.ps1'
-            failOnStderr: true
-            showWarnings: true
-
-        - task: PowerShell@2
-          displayName: 'Build Samples'
-          inputs:
-            targetType: filePath
-            filePath: './eng/build-samples.ps1'
-            arguments: '-Configuration $(_BuildConfig) -TreatWarningsAsErrors -BinaryLogDirectory "$(Build.SourcesDirectory)\artifacts\log\$(_BuildConfig)"'
-            failOnStderr: false
-
       - job: Linux
         timeoutInMinutes: 90
         pool:
@@ -220,13 +188,6 @@ stages:
             /p:FastAcceptanceTest=true
           displayName: Build
 
-        - task: PublishBuildArtifacts@1
-          displayName: 'Publish NuGet packages'
-          inputs:
-            PathtoPublish: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/Shipping'
-            ArtifactName: '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)'
-          condition: always()
-
         - ${{ if eq(parameters.SkipTests, False) }}:
           # Because the build step is using -ci flag, restore is done in a local .packages directory.
           # We need to pass NUGET_PACKAGES so that when dotnet test is doing evaluation phase on the projects, it can resolve .props/.targets from packages and import them.
@@ -284,13 +245,6 @@ stages:
             /p:FastAcceptanceTest=true
           displayName: Build
 
-        - task: PublishBuildArtifacts@1
-          displayName: 'Publish NuGet packages'
-          inputs:
-            PathtoPublish: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/Shipping'
-            ArtifactName: '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)'
-          condition: always()
-
         - ${{ if eq(parameters.SkipTests, False) }}:
           # Because the build step is using -ci flag, restore is done in a local .packages directory.
           # We need to pass NUGET_PACKAGES so that when dotnet test is doing evaluation phase on the projects, it can resolve .props/.targets from packages and import them.
@@ -325,3 +279,41 @@ stages:
               PathtoPublish: '$(Build.ArtifactStagingDirectory)/binlogs'
               ArtifactName: Integration_Tests_MacOS_Binlogs_$(_BuildConfig)
             condition: always()
+
+  - template: /eng/common/templates/jobs/jobs.yml
+    parameters:
+      enableMicrobuild: true
+      enablePublishUsingPipelines: true
+      artifacts:
+        publish:
+          logs: true
+          manifests: true
+      enableTelemetry: true
+      jobs:
+      - job: WindowsSamples
+        timeoutInMinutes: 30
+        pool:
+          name: NetCore-Public
+          demands: ImageOverride -equals windows.vs2026preview.scout.amd64.open
+        strategy:
+          matrix:
+            Release:
+              _BuildConfig: Release
+            Debug:
+              _BuildConfig: Debug
+        steps:
+        - task: PowerShell@2
+          displayName: 'Install Windows SDK'
+          inputs:
+            targetType: filePath
+            filePath: './eng/install-windows-sdk.ps1'
+            failOnStderr: true
+            showWarnings: true
+
+        - task: PowerShell@2
+          displayName: 'Build Samples'
+          inputs:
+            targetType: filePath
+            filePath: './eng/build-samples.ps1'
+            arguments: '-Configuration $(_BuildConfig) -TreatWarningsAsErrors -BinaryLogDirectory "$(Build.SourcesDirectory)\artifacts\log\$(_BuildConfig)"'
+            failOnStderr: false