diff --git a/eng/pipelines/corefx-base.yml b/eng/pipelines/corefx-base.yml
index ece21147c5a4..cf57a44936df 100644
--- a/eng/pipelines/corefx-base.yml
+++ b/eng/pipelines/corefx-base.yml
@@ -208,10 +208,19 @@ jobs:
                   helixToken: ''
 
           - ${{ if eq(parameters.isOfficialBuild, 'true') }}:
+            - task: CopyFiles@2
+              displayName: Prepare artifacts packages folder to publish
+              inputs:
+                sourceFolder: $(Build.SourcesDirectory)/artifacts/packages
+                targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/packages
+                contents: |
+                  **/System.Net.Http.Json*.nupkg
+              condition: and(succeeded(), eq(variables['_publishPackages'], true))
+
             - task: PublishBuildArtifacts@1
               displayName: Publish packages to artifacts container
               inputs:
-                pathToPublish: $(Build.SourcesDirectory)/artifacts/packages
+                pathToPublish: $(Build.ArtifactStagingDirectory)/artifacts/packages
                 artifactName: packages
                 artifactType: container
-              condition: and(succeeded(), ne(variables['_skipPublishPackages'], 'true'))
+              condition: and(succeeded(), eq(variables['_publishPackages'], 'true'))
diff --git a/eng/pipelines/windows.yml b/eng/pipelines/windows.yml
index 60fceaffb9aa..e4be3658e962 100644
--- a/eng/pipelines/windows.yml
+++ b/eng/pipelines/windows.yml
@@ -75,28 +75,24 @@ stages:
                 _architecture: x86
                 _framework: netfx
                 _helixQueues: $(uapNetfxQueues)
-                _skipPublishPackages: true # In NETFX leg we don't produce packages
 
               NETFX_x64_Release:
                 _BuildConfig: Release
                 _architecture: x64
                 _framework: netfx
                 _helixQueues: $(uapNetfxQueues)
-                _skipPublishPackages: true # In NETFX leg we don't produce packages
 
               UAP_x64_Release:
                 _BuildConfig: Release
                 _architecture: x64
                 _framework: uap
                 _helixQueues: $(uapNetfxQueues)
-                _skipPublishPackages: true # In UWP we don't produce packages
 
               UAP_x86_Release:
                 _BuildConfig: Release
                 _architecture: x86
                 _framework: uap
                 _helixQueues: $(uapNetfxQueues)
-                _skipPublishPackages: true # In UWP we don't produce packages
 
               arm64_Release:
                 _BuildConfig: Release
@@ -144,6 +140,7 @@ stages:
                   _architecture: x64
                   _framework: allConfigurations
                   _helixQueues: $(allConfigurationsQueues)
+                  _publishPackages: true
 
           pool:
             ${{ if ne(variables['System.TeamProject'], 'public') }}: