diff --git a/builds/azure-pipelines/build-pr.yml b/builds/azure-pipelines/build-pr.yml
index c1081afb..53ea4f7a 100644
--- a/builds/azure-pipelines/build-pr.yml
+++ b/builds/azure-pipelines/build-pr.yml
@@ -9,41 +9,57 @@ pr:
 variables:
   solution: '**/*.sln'
   configuration: 'Debug'
+  nugetVersion: '99.99.99-test'
+  binariesVersion: '99.99.99'
+  oopWorkerSupportedExtensionVersion: '99.99.99-test'
 
 stages:
 - stage: Build
   displayName: 'PR Validation'
 
   jobs:
-  - job: BuildTest
-    displayName: 'Build and Test on'
-
-    # Verifies cross-platform build and test
-    strategy:
-      matrix:
-        mac:
-          imageName: 'macos-latest'
-          testServer: ''
-        windows:
-          imageName: 'windows-latest'
-          testServer: '(LocalDb)\MSSQLLocalDB'
-        linux:
-          imageName: 'ubuntu-latest'
-          testServer: ''
-
+  - job: Mac
+    timeoutInMinutes: 90
     pool:
-      vmImage: '$(imageName)'
-
+      vmImage: macos-latest
+    workspace:
+      clean: all
+    steps:
+    - template: 'template-steps-build-test.yml'
+      parameters:
+        solution: '$(solution)'
+        configuration: '$(configuration)'
+        testServer: 'localhost'
+        nugetVersion: '$(nugetVersion)'
+        binariesVersion: '$(binariesVersion)'
+        oopWorkerSupportedExtensionVersion: '$(oopWorkerSupportedExtensionVersion)'
+  - job: Linux
+    timeoutInMinutes: 90
+    pool:
+      vmImage: ubuntu-latest
+    workspace:
+      clean: all
+    steps:
+    - template: 'template-steps-build-test.yml'
+      parameters:
+        solution: '$(solution)'
+        configuration: '$(configuration)'
+        testServer: 'localhost'
+        nugetVersion: '$(nugetVersion)'
+        binariesVersion: '$(binariesVersion)'
+        oopWorkerSupportedExtensionVersion: '$(oopWorkerSupportedExtensionVersion)'
+  - job: Windows
+    timeoutInMinutes: 90
+    pool:
+      vmImage: windows-latest
     workspace:
       clean: all
-
-    timeoutInMinutes: '90'
-
     steps:
     - template: 'template-steps-build-test.yml'
       parameters:
         solution: '$(solution)'
         configuration: '$(configuration)'
-        nugetVersion: '99.99.99-test'
-        binariesVersion: '99.99.99'
-        oopWorkerSupportedExtensionVersion: '99.99.99-test'
\ No newline at end of file
+        testServer: '(LocalDb)\MSSQLLocalDB'
+        nugetVersion: '$(nugetVersion)'
+        binariesVersion: '$(binariesVersion)'
+        oopWorkerSupportedExtensionVersion: '$(oopWorkerSupportedExtensionVersion)'
\ No newline at end of file
diff --git a/builds/azure-pipelines/template-steps-build-test.yml b/builds/azure-pipelines/template-steps-build-test.yml
index e48e95f0..790da761 100644
--- a/builds/azure-pipelines/template-steps-build-test.yml
+++ b/builds/azure-pipelines/template-steps-build-test.yml
@@ -146,7 +146,7 @@ steps:
 - task: DotNetCoreCLI@2
   displayName: '.NET Test on Mac (unit tests only)'
   env:
-    TEST_SERVER: '$(testServer)'
+    TEST_SERVER: ${{ parameters.testServer }}
     NODE_MODULES_PATH: '$(nodeModulesPath)'
     AZUREFUNCTIONS_SQLBINDINGS_TELEMETRY_OPTOUT: '1'
   inputs:
@@ -158,7 +158,7 @@ steps:
 - task: DotNetCoreCLI@2
   displayName: '.NET Test on Windows (unit tests and .NET In-Proc integration tests)'
   env:
-    TEST_SERVER: '$(testServer)'
+    TEST_SERVER: ${{ parameters.testServer }}
     NODE_MODULES_PATH: '$(nodeModulesPath)'
     AZUREFUNCTIONS_SQLBINDINGS_TELEMETRY_OPTOUT: '1'
     # Only running CSharp integration tests to get accurate code coverage numbers
@@ -174,7 +174,7 @@ steps:
 - task: DotNetCoreCLI@2
   displayName: '.NET Test on Windows (Non .NET In-Proc)'
   env:
-    TEST_SERVER: '$(testServer)'
+    TEST_SERVER: ${{ parameters.testServer }}
     NODE_MODULES_PATH: '$(nodeModulesPath)'
     AZUREFUNCTIONS_SQLBINDINGS_TELEMETRY_OPTOUT: '1'
     LANGUAGES_TO_TEST: 'Java,JavaScript,OutOfProc,PowerShell,Python,Csx'