diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e7d8c3f3b011..a8e88ff25b88 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -55,8 +55,6 @@ stages:
 
 - stage: Build
   pool: sonicbld
-  variables:
-    INSTALL_DEBUG_TOOLS: y
   dependsOn: []
   jobs:
   - template: .azure-pipelines/azure-pipelines-build.yml
@@ -67,6 +65,10 @@ stages:
         variables:
           swi_image: yes
       - name: mellanox
+        variables:
+          dbg_image: yes
+          docker_syncd_rpc_image: yes
+          platform_rpc: mlnx
       - name: marvell-arm64
         pool: sonicbld-arm64
         variables: