diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
index 27f7ba4..972af7a 100644
--- a/.azure-pipelines/build-template.yml
+++ b/.azure-pipelines/build-template.yml
@@ -10,10 +10,10 @@ parameters:
 - name: pool
   type: string
   values:
-  - sonicbld
+  - sonicso1ES-amd64
   - default
-  - sonicbld-armhf
-  - sonicbld-arm64
+  - sonicso1ES-armhf
+  - sonicso1ES-arm64
   default: default
 
 - name: timeout
@@ -38,7 +38,7 @@ jobs:
     ${{ if ne(parameters.pool, 'default') }}:
       name: ${{ parameters.pool }}
     ${{ if eq(parameters.pool, 'default') }}:
-      vmImage: 'ubuntu-20.04'
+      vmImage: 'ubuntu-latest'
 
   container:
     image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}:latest
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9a7986e..2c117f9 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -3,7 +3,7 @@
 # Add steps that build, run tests, deploy, and more:
 # https://aka.ms/yaml
 
-pool: sonicbld
+pool: sonicso1ES-amd64
 
 trigger:
   branches:
@@ -33,7 +33,7 @@ stages:
     parameters:
       arch: armhf
       timeout: 180
-      pool: sonicbld-armhf
+      pool: sonicso1ES-armhf
       sonic_slave: sonic-slave-bookworm-armhf
       swss_common_artifact_name: sonic-swss-common-bookworm.armhf
       artifact_name: sonic-stp.armhf
@@ -42,7 +42,7 @@ stages:
     parameters:
       arch: arm64
       timeout: 180
-      pool: sonicbld-arm64
+      pool: sonicso1ES-arm64
       sonic_slave: sonic-slave-bookworm-arm64
       swss_common_artifact_name: sonic-swss-common-bookworm.arm64
       artifact_name: sonic-stp.arm64