diff --git a/.vsts-dotnet-ci.yml b/.vsts-dotnet-ci.yml
index c2e0e2c0d..4e18da7c9 100644
--- a/.vsts-dotnet-ci.yml
+++ b/.vsts-dotnet-ci.yml
@@ -11,5 +11,3 @@ phases:
     buildScript: build.cmd
     queue:
       name: Hosted VS2017
-      demands:
-        - agent.os -equals Windows_NT
diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml
index bd326afb6..ce86cbbdc 100644
--- a/build/ci/phase-template.yml
+++ b/build/ci/phase-template.yml
@@ -13,12 +13,12 @@ phases:
       ${{ if ne(parameters.dockerImage, '') }}:
         _PREVIEW_VSTS_DOCKER_IMAGE: ${{ parameters.dockerImage }}
     queue:
-      parallel: 2
+      parallel: 99
       matrix:
         Build_Debug:
           _configuration: Debug
         Build_Release:
-          _configuration: Release 
+          _configuration: Release
       ${{ insert }}: ${{ parameters.queue }}
     steps:
     - script: $(_buildScript) -$(_configuration) -runtests