diff --git a/azure-pipelines-richnav.yml b/azure-pipelines-richnav.yml
index a9f7be9291d..8615bed3d80 100644
--- a/azure-pipelines-richnav.yml
+++ b/azure-pipelines-richnav.yml
@@ -18,7 +18,7 @@ stages:
             timeoutInMinutes: 90
             enablePublishTestResults: true
             pool:
-              name: NetCore1ESPool-Public
+              name: NetCore1ESPool-Svc-Public
               demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
             steps:
               - task: NuGetCommand@2
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 76f61d710a7..bf397970909 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -59,10 +59,10 @@ stages:
             enablePublishTestResults: true
             pool:
               ${{ if eq(variables['System.TeamProject'], 'public') }}:
-                name: NetCore1ESPool-Public
+                name: NetCore1ESPool-Svc-Public
                 demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
               ${{ if ne(variables['System.TeamProject'], 'public') }}:
-                name: NetCore1ESPool-Internal
+                name: NetCore1ESPool-Svc-Internal
                 demands: ImageOverride -equals Build.Server.Amd64.VS2019
             variables:
               - _InternalBuildArgs: ''
@@ -145,7 +145,7 @@ stages:
               ${{ if or(ne(variables['System.TeamProject'], 'internal'), in(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule')) }}:
                 vmImage: ubuntu-18.04
               ${{ if and(eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule')) }}:
-                name: NetCore1ESPool-Internal
+                name: NetCore1ESPool-Svc-Internal
                 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
             variables:
               - _runCounter: $[counter(variables['Build.Reason'], 0)]
@@ -192,10 +192,10 @@ stages:
             timeoutInMinutes: 180
             pool:
               ${{ if eq(variables['System.TeamProject'], 'public') }}:
-                name: NetCore1ESPool-Public
+                name: NetCore1ESPool-Svc-Public
                 demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
               ${{ if ne(variables['System.TeamProject'], 'public') }}:
-                name: NetCore1ESPool-Internal
+                name: NetCore1ESPool-Svc-Internal
                 demands: ImageOverride -equals Build.Server.Amd64.VS2019
             variables:
               - name: _HelixBuildConfig