diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
index 3969ac0fe..32d7e7205 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 297370376..0d7702ae6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -66,7 +66,7 @@ stages:
   - template: .azure-pipelines/build-template.yml
     parameters:
       arch: armhf
-      timeout: 180
+      timeout: 240
       pool: sonicbld-armhf
       sonic_slave: sonic-slave-${{ parameters.debian_version }}-armhf
       swss_common_artifact_name: sonic-swss-common.armhf
@@ -76,7 +76,7 @@ stages:
   - template: .azure-pipelines/build-template.yml
     parameters:
       arch: arm64
-      timeout: 180
+      timeout: 240
       pool: sonicbld-arm64
       sonic_slave: sonic-slave-${{ parameters.debian_version }}-arm64
       swss_common_artifact_name: sonic-swss-common.arm64