diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ae2f043894..af364288c3 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -52,19 +52,19 @@ jobs:
       dotnet --info
       printenv
       dotnet cake build.cake -target="Azure-OSX" -configuration="Release"
+  
   - task: PublishBuildArtifacts@1
     inputs:
-      pathtoPublish: '$(Build.SourcesDirectory)/artifacts/nuget'
-      artifactName: 'NuGet'
+      pathToPublish: '$(Build.SourcesDirectory)/Build/Products/Release/'
+      artifactName: 'Avalonia.Native.OSX'
   - task: PublishBuildArtifacts@1
     inputs:
-      pathToPublish: '$(Build.SourcesDirectory)/artifacts/zip'
-      artifactName: 'Samples'
+      pathToPublish: '$(Build.SourcesDirectory)/artifacts/bin'
+      artifactName: 'BinariesOSX'
   - task: PublishBuildArtifacts@1
     inputs:
-      pathToPublish: '$(Build.SourcesDirectory)/artifacts/bin'
-      artifactName: 'BinariesWindows'
-
+      pathToPublish: '$(Build.SourcesDirectory)/src/Avalonia.Native/nuget'
+      artifactName: 'Avalonia.Native.Nuspec'
 
 - job: Windows
   pool:
@@ -78,4 +78,16 @@ jobs:
     inputs:
       script: |
         set PATH=%PATH%;%USERPROFILE%\.dotnet\tools
-        dotnet cake build.cake -target="Azure-Windows" -configuration="Release"
\ No newline at end of file
+        dotnet cake build.cake -target="Azure-Windows" -configuration="Release"
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: '$(Build.SourcesDirectory)/artifacts/nuget'
+      artifactName: 'NuGet'
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathToPublish: '$(Build.SourcesDirectory)/artifacts/zip'
+      artifactName: 'Samples'
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathToPublish: '$(Build.SourcesDirectory)/artifacts/bin'
+      artifactName: 'BinariesWindows'
diff --git a/build.cake b/build.cake
index f00da544c6..fbd915461f 100644
--- a/build.cake
+++ b/build.cake
@@ -271,12 +271,14 @@ Task("Azure-Linux")
   .IsDependentOn("Run-Tests");
 
 Task("Azure-OSX")
-  .IsDependentOn("Package")
+  .IsDependentOn("Run-Tests")
   .IsDependentOn("Copy-Files-Impl")
   .IsDependentOn("Zip-Files-Impl");
 
 Task("Azure-Windows")
-  .IsDependentOn("Run-Tests");
+  .IsDependentOn("Package")
+  .IsDependentOn("Copy-Files-Impl")
+  .IsDependentOn("Zip-Files-Impl");
 
 ///////////////////////////////////////////////////////////////////////////////
 // EXECUTE