diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
index 8e2c4823e0..82cfd4a05d 100644
--- a/.azure-pipelines/build-template.yml
+++ b/.azure-pipelines/build-template.yml
@@ -10,6 +10,8 @@ parameters:
   type: string
   values:
   - sonicbld
+  - sonicbld-arm64
+  - sonicbld-armhf
   - default
   default: default
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 49f85d5a50..804b5810ad 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -37,7 +37,7 @@ stages:
     parameters:
       arch: armhf
       timeout: 240
-      pool: sonicbld
+      pool: sonicbld-armhf
       sonic_slave: sonic-slave-buster-armhf
       swss_common_artifact_name: sonic-swss-common.armhf
       artifact_name: sonic-sairedis.armhf
@@ -47,7 +47,7 @@ stages:
     parameters:
       arch: arm64
       timeout: 240
-      pool: sonicbld
+      pool: sonicbld-arm64
       sonic_slave: sonic-slave-buster-arm64
       swss_common_artifact_name: sonic-swss-common.arm64
       artifact_name: sonic-sairedis.arm64