diff --git a/platform/mellanox/docker-syncd-mlnx.mk b/platform/mellanox/docker-syncd-mlnx.mk
index 1328d0e0d0..37ffe1203f 100644
--- a/platform/mellanox/docker-syncd-mlnx.mk
+++ b/platform/mellanox/docker-syncd-mlnx.mk
@@ -21,6 +21,10 @@ include $(PLATFORM_PATH)/../template/docker-syncd-bullseye.mk
 
 $(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API) $(MFT)
 
+ifeq ($(ENABLE_ASAN), y)
+$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD_DBG)
+endif
+
 $(DOCKER_SYNCD_BASE)_FILES += $(ISSU_VERSION_FILE)
 
 $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
diff --git a/rules/docker-orchagent.mk b/rules/docker-orchagent.mk
index 917fe0b136..fed461290f 100644
--- a/rules/docker-orchagent.mk
+++ b/rules/docker-orchagent.mk
@@ -6,6 +6,10 @@ DOCKER_ORCHAGENT_DBG = $(DOCKER_ORCHAGENT_STEM)-$(DBG_IMAGE_MARK).gz
 
 $(DOCKER_ORCHAGENT)_DEPENDS += $(SWSS)
 
+ifeq ($(ENABLE_ASAN), y)
+$(DOCKER_ORCHAGENT)_DEPENDS += $(SWSS_DBG)
+endif
+
 $(DOCKER_ORCHAGENT)_DBG_DEPENDS = $($(DOCKER_SWSS_LAYER_BULLSEYE)_DBG_DEPENDS)
 $(DOCKER_ORCHAGENT)_DBG_DEPENDS +=   $(SWSS_DBG) \
                                 $(LIBSWSSCOMMON_DBG) \
diff --git a/rules/syncd.mk b/rules/syncd.mk
index 595e04671c..2b7007d84d 100644
--- a/rules/syncd.mk
+++ b/rules/syncd.mk
@@ -21,12 +21,10 @@ $(SYNCD)_DEPENDS += $(LIBSWSSCOMMON_DEV) $(LIBTHRIFT_DEV)
 $(SYNCD)_DPKG_TARGET = binary-syncd-rpc
 endif
 
-ifeq ($(INSTALL_DEBUG_TOOLS), y)
 SYNCD_DBG = syncd-dbg_1.0.0_$(CONFIGURED_ARCH).deb
 $(SYNCD_DBG)_DEPENDS += $(SYNCD)
 $(SYNCD_DBG)_RDEPENDS += $(SYNCD)
 $(eval $(call add_derived_package,$(SYNCD),$(SYNCD_DBG)))
-endif
 
 ifeq ($(ENABLE_SYNCD_RPC),y)
 SYNCD_RPC_DBG = syncd-rpc-dbg_1.0.0_$(CONFIGURED_ARCH).deb