diff --git a/jenkins/broadcom/buildimage-brcm-all/Jenkinsfile b/jenkins/broadcom/buildimage-brcm-all/Jenkinsfile
index 1ac0f44bcae2..b33348cd3615 100644
--- a/jenkins/broadcom/buildimage-brcm-all/Jenkinsfile
+++ b/jenkins/broadcom/buildimage-brcm-all/Jenkinsfile
@@ -34,6 +34,8 @@ pipeline {
 git submodule foreach --recursive '[ -f .git ] && echo "gitdir: $(realpath --relative-to=. $(cut -d" " -f2 .git))" > .git'
 
 make configure PLATFORM=broadcom
+make SONIC_CONFIG_BUILD_JOBS=1 INSTALL_DEBUG_TOOLS=y target/sonic-broadcom.bin
+mv target/sonic-broadcom.bin target/sonic-broadcom-dbg.bin
 make SONIC_CONFIG_BUILD_JOBS=1 target/sonic-broadcom.bin
 make SONIC_CONFIG_BUILD_JOBS=1 target/sonic-aboot-broadcom.swi
 make SONIC_CONFIG_BUILD_JOBS=1 target/sonic-broadcom.raw
diff --git a/jenkins/mellanox/buildimage-mlnx-all/Jenkinsfile b/jenkins/mellanox/buildimage-mlnx-all/Jenkinsfile
index e52d25b308c6..a10ce95b0600 100644
--- a/jenkins/mellanox/buildimage-mlnx-all/Jenkinsfile
+++ b/jenkins/mellanox/buildimage-mlnx-all/Jenkinsfile
@@ -35,6 +35,8 @@ pipeline {
 git submodule foreach --recursive '[ -f .git ] && echo "gitdir: $(realpath --relative-to=. $(cut -d" " -f2 .git))" > .git'
 
 make configure PLATFORM=mellanox
+make SONIC_CONFIG_BUILD_JOBS=1 ENABLE_DHCP_GRAPH_SERVICE=y INSTALL_DEBUG_TOOLS=y target/sonic-mellanox.bin
+mv target/sonic-mellanox.bin target/sonic-mellanox-dbg.bin
 make SONIC_CONFIG_BUILD_JOBS=1 ENABLE_DHCP_GRAPH_SERVICE=y target/sonic-mellanox.bin
 ENABLE_SYNCD_RPC=y make SONIC_CONFIG_BUILD_JOBS=1 target/docker-syncd-mlnx-rpc.gz target/docker-ptf-mlnx.gz
 '''