diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
index 31a01924e4..7e9c33b98e 100644
--- a/build/azure-pipelines.yml
+++ b/build/azure-pipelines.yml
@@ -91,7 +91,7 @@ stages:
         testResultsFiles: '**\TESTS-*.xml'
   
     - task: PowerShell@1
-      displayName: 'Prepare Packages'
+      displayName: 'Prepare Packages & Zip'
       inputs:
         scriptType: inlineScript
         inlineScript: |
@@ -100,6 +100,21 @@ stages:
          
          $ubuild.CompileUmbraco()
          $ubuild.PreparePackages()
+         $ubuild.PackageZip()
+
+    - task: CopyFiles@2
+      displayName: 'Copy Zip Files to Staging'
+      inputs:
+        SourceFolder: build.out
+        Contents: '*.zip'
+        TargetFolder: '$(build.artifactstagingdirectory)'
+        CleanTargetFolder: true
+
+    - task: PublishBuildArtifacts@1
+      displayName: 'Publish Zip Files'
+      inputs:
+        PathtoPublish: '$(build.artifactstagingdirectory)'
+        ArtifactName: zips
   
     - task: PowerShell@1
       displayName: 'Verify & Package NuGet'
@@ -112,6 +127,36 @@ stages:
          $ubuild.VerifyNuGet()
          $ubuild.PackageNuGet()
 
+    - task: CopyFiles@2
+      displayName: 'Copy NuPkg Files to Staging'
+      inputs:
+        SourceFolder: build.out
+        Contents: '*.nupkg'
+        TargetFolder: '$(build.artifactstagingdirectory)'
+        CleanTargetFolder: true
+    
+    - task: PublishBuildArtifacts@1
+      displayName: 'Publish NuPkg Files'
+      inputs:
+        PathtoPublish: '$(build.artifactstagingdirectory)'
+        ArtifactName: nupkg
+
+    - task: CopyFiles@2
+      displayName: 'Copy Log Files to Staging'
+      inputs:
+        SourceFolder: build.tmp
+        Contents: '*.log'
+        TargetFolder: '$(build.artifactstagingdirectory)'
+        CleanTargetFolder: true
+      condition: succeededOrFailed()
+    
+    - task: PublishBuildArtifacts@1
+      displayName: 'Publish Log Files'
+      inputs:
+        PathtoPublish: '$(build.artifactstagingdirectory)'
+        ArtifactName: logs
+      condition: succeededOrFailed()
+
 
   - job: Integration_Tests
     displayName: 'Integration Tests'