diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 243e45f49..672ee0945 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -14,7 +14,23 @@ stages:
   displayName: Build
   jobs:
   - job: BuildJob
-    displayName: Build & Unit Tests
+    displayName: Create NuGet Packages
+    pool:
+      vmImage: 'ubuntu-22.04'
+    steps:
+    - template: .azuredevops/pipelines/templates/steps/install-required-dotnet-versions-for-building.yml 
+    - bash: ./build.sh --target=Create-NuGet-Packages
+      displayName: 'Build & Run Unit Tests'
+    - publish: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
+      artifact: NuGet Package
+      displayName: 'Publish NuGet package as build artifact'
+
+- stage: UnitTestStage
+  displayName: Unit Tests
+  dependsOn: []
+  jobs:
+  - job: UnitTestJob
+    displayName: Unit Tests
     strategy:
       matrix:
         Windows:
@@ -27,12 +43,8 @@ stages:
       vmImage: $(imageName)
     steps:
     - template: .azuredevops/pipelines/templates/steps/install-required-dotnet-versions-for-building.yml 
-    - bash: ./build.sh
-      displayName: 'Build & Run Unit Tests'
-    - publish: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
-      artifact: NuGet Package
-      displayName: 'Publish NuGet package as build artifact'
-      condition: eq( variables['System.JobName'], 'Windows' )
+    - bash: ./build.sh --target=Test
+      displayName: 'Run Unit Tests'
 
 - stage: IntegrationTestsGitRepositoryStage
   displayName: Integration Tests Cake.Issues.GitRepository