diff --git a/Makefile.work b/Makefile.work
index ba61b48059ad..1809e2b6c0d8 100644
--- a/Makefile.work
+++ b/Makefile.work
@@ -10,7 +10,8 @@
 #  * SHUTDOWN_BGP_ON_START: Sets admin-down state for all bgp peerings after restart.
 #  * ENABLE_PFCWD_ON_START: Enable PFC Watchdog (PFCWD) on server-facing ports
 #  * by default for TOR switch.
-#  * SONIC_ENABLE_SYNCD_RPC: Enables rpc-based syncd builds.
+#  * ENABLE_SYNCD_RPC: Enables rpc-based syncd builds.
+#  * INSTALL_DEBUG_TOOLS: Install debug tools and debug symbol packeages.
 #  * USERNAME: Desired username -- default at rules/config
 #  * PASSWORD: Desired password -- default at rules/config
 #  * KEEP_SLAVE_ON: Keeps slave container up and active after building process concludes.
@@ -95,6 +96,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            SHUTDOWN_BGP_ON_START=$(SHUTDOWN_BGP_ON_START) \
                            SONIC_ENABLE_PFCWD_ON_START=$(ENABLE_PFCWD_ON_START) \
                            SONIC_ENABLE_SYNCD_RPC=$(ENABLE_SYNCD_RPC) \
+                           SONIC_INSTALL_DEBUG_TOOLS=$(INSTALL_DEBUG_TOOLS) \
                            PASSWORD=$(PASSWORD) \
                            USERNAME=$(USERNAME) \
                            SONIC_BUILD_JOBS=$(SONIC_BUILD_JOBS) \
diff --git a/platform/barefoot/docker-orchagent-bfn.mk b/platform/barefoot/docker-orchagent-bfn.mk
index 67069a6060c4..fefd39691855 100644
--- a/platform/barefoot/docker-orchagent-bfn.mk
+++ b/platform/barefoot/docker-orchagent-bfn.mk
@@ -3,6 +3,11 @@
 DOCKER_ORCHAGENT_BFN = docker-orchagent-bfn.gz
 $(DOCKER_ORCHAGENT_BFN)_PATH = $(DOCKERS_PATH)/docker-orchagent
 $(DOCKER_ORCHAGENT_BFN)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(IPROUTE2)
+ifeq ($(INSTALL_DEBUG_TOOLS), y)
+$(DOCKER_ORCHAGENT_BFN)_DEPENDS += $(SWSS_DBG) \
+                                   $(LIBSWSSCOMMON_DBG) \
+                                   $(LIBSAIREDIS_DBG)
+endif
 $(DOCKER_ORCHAGENT_BFN)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
 SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_BFN)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_BFN)
diff --git a/platform/broadcom/docker-orchagent-brcm.mk b/platform/broadcom/docker-orchagent-brcm.mk
index 5b4cd31f8b39..dc3c31f43d5b 100644
--- a/platform/broadcom/docker-orchagent-brcm.mk
+++ b/platform/broadcom/docker-orchagent-brcm.mk
@@ -3,6 +3,11 @@
 DOCKER_ORCHAGENT_BRCM = docker-orchagent-brcm.gz
 $(DOCKER_ORCHAGENT_BRCM)_PATH = $(DOCKERS_PATH)/docker-orchagent
 $(DOCKER_ORCHAGENT_BRCM)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(IPROUTE2)
+ifeq ($(INSTALL_DEBUG_TOOLS), y)
+$(DOCKER_ORCHAGENT_BRCM)_DEPENDS += $(SWSS_DBG) \
+                                    $(LIBSWSSCOMMON_DBG) \
+                                    $(LIBSAIREDIS_DBG)
+endif
 $(DOCKER_ORCHAGENT_BRCM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
 SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_BRCM)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_BRCM)
diff --git a/platform/cavium/docker-orchagent-cavm.mk b/platform/cavium/docker-orchagent-cavm.mk
index 6513fbabf4f3..282cdaa9172d 100644
--- a/platform/cavium/docker-orchagent-cavm.mk
+++ b/platform/cavium/docker-orchagent-cavm.mk
@@ -3,6 +3,11 @@
 DOCKER_ORCHAGENT_CAVM = docker-orchagent-cavm.gz
 $(DOCKER_ORCHAGENT_CAVM)_PATH = $(DOCKERS_PATH)/docker-orchagent
 $(DOCKER_ORCHAGENT_CAVM)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(IPROUTE2)
+ifeq ($(INSTALL_DEBUG_TOOLS), y)
+$(DOCKER_ORCHAGENT_CAVM)_DEPENDS += $(SWSS_DBG) \
+                                    $(LIBSWSSCOMMON_DBG) \
+                                    $(LIBSAIREDIS_DBG)
+endif
 $(DOCKER_ORCHAGENT_CAVM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
 SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_CAVM)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_CAVM)
diff --git a/platform/centec/docker-orchagent-centec.mk b/platform/centec/docker-orchagent-centec.mk
index c6ee277f7ed7..891f5550bac6 100644
--- a/platform/centec/docker-orchagent-centec.mk
+++ b/platform/centec/docker-orchagent-centec.mk
@@ -3,6 +3,11 @@
 DOCKER_ORCHAGENT_CENTEC = docker-orchagent-centec.gz
 $(DOCKER_ORCHAGENT_CENTEC)_PATH = $(DOCKERS_PATH)/docker-orchagent
 $(DOCKER_ORCHAGENT_CENTEC)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(IPROUTE2)
+ifeq ($(INSTALL_DEBUG_TOOLS), y)
+$(DOCKER_ORCHAGENT_CENTEC)_DEPENDS += $(SWSS_DBG) \
+                                      $(LIBSWSSCOMMON_DBG) \
+                                      $(LIBSAIREDIS_DBG)
+endif
 $(DOCKER_ORCHAGENT_CENTEC)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
 SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_CENTEC)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_CENTEC)
diff --git a/platform/marvell/docker-orchagent-mrvl.mk b/platform/marvell/docker-orchagent-mrvl.mk
index 1106aedac05d..9c3c4c13a8f9 100644
--- a/platform/marvell/docker-orchagent-mrvl.mk
+++ b/platform/marvell/docker-orchagent-mrvl.mk
@@ -3,6 +3,11 @@
 DOCKER_ORCHAGENT_MRVL = docker-orchagent-mrvl.gz
 $(DOCKER_ORCHAGENT_MRVL)_PATH = $(DOCKERS_PATH)/docker-orchagent
 $(DOCKER_ORCHAGENT_MRVL)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(IPROUTE2)
+ifeq ($(INSTALL_DEBUG_TOOLS), y)
+$(DOCKER_ORCHAGENT_MRVL)_DEPENDS += $(SWSS_DBG) \
+                                    $(LIBSWSSCOMMON_DBG) \
+                                    $(LIBSAIREDIS_DBG)
+endif
 $(DOCKER_ORCHAGENT_MRVL)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
 SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_MRVL)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_MRVL)
diff --git a/platform/mellanox/docker-orchagent-mlnx.mk b/platform/mellanox/docker-orchagent-mlnx.mk
index f43f986527a3..5e72beb4c300 100644
--- a/platform/mellanox/docker-orchagent-mlnx.mk
+++ b/platform/mellanox/docker-orchagent-mlnx.mk
@@ -3,6 +3,11 @@
 DOCKER_ORCHAGENT_MLNX = docker-orchagent-mlnx.gz
 $(DOCKER_ORCHAGENT_MLNX)_PATH = $(DOCKERS_PATH)/docker-orchagent
 $(DOCKER_ORCHAGENT_MLNX)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(IPROUTE2)
+ifeq ($(INSTALL_DEBUG_TOOLS), y)
+$(DOCKER_ORCHAGENT_MLNX)_DEPENDS += $(SWSS_DBG) \
+                                    $(LIBSWSSCOMMON_DBG) \
+                                    $(LIBSAIREDIS_DBG)
+endif
 $(DOCKER_ORCHAGENT_MLNX)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
 SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_MLNX)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_MLNX)
diff --git a/platform/nephos/docker-orchagent-nephos.mk b/platform/nephos/docker-orchagent-nephos.mk
index 098a94772b5c..f7719b3df5dd 100644
--- a/platform/nephos/docker-orchagent-nephos.mk
+++ b/platform/nephos/docker-orchagent-nephos.mk
@@ -3,6 +3,11 @@
 DOCKER_ORCHAGENT_NEPHOS = docker-orchagent-nephos.gz
 $(DOCKER_ORCHAGENT_NEPHOS)_PATH = $(DOCKERS_PATH)/docker-orchagent
 $(DOCKER_ORCHAGENT_NEPHOS)_DEPENDS += $(SWSS) $(REDIS_TOOLS) $(IPROUTE2)
+ifeq ($(INSTALL_DEBUG_TOOLS), y)
+$(DOCKER_ORCHAGENT_NEPHOS)_DEPENDS += $(SWSS_DBG) \
+                                      $(LIBSWSSCOMMON_DBG) \
+                                      $(LIBSAIREDIS_DBG)
+endif
 $(DOCKER_ORCHAGENT_NEPHOS)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
 SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_NEPHOS)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_NEPHOS)
diff --git a/platform/vs/docker-sonic-vs.mk b/platform/vs/docker-sonic-vs.mk
index ce0f4f3dea09..e534a5392c8c 100644
--- a/platform/vs/docker-sonic-vs.mk
+++ b/platform/vs/docker-sonic-vs.mk
@@ -13,6 +13,13 @@ $(DOCKER_SONIC_VS)_DEPENDS += $(SWSS) \
                               $(SONIC_UTILS) \
                               $(IPROUTE2)
 
+ifeq ($(INSTALL_DEBUG_TOOLS), y)
+$(DOCKER_SONIC_VS)_DEPENDS += $(SWSS_DBG) \
+                              $(LIBSWSSCOMMON_DBG) \
+                              $(LIBSAIREDIS_DBG) \
+                              $(SYNCD_VS_DBG)
+endif
+
 ifeq ($(SONIC_ROUTING_STACK), quagga)
 $(DOCKER_SONIC_VS)_DEPENDS += $(QUAGGA)
 else ifeq ($(SONIC_ROUTING_STACK), frr)
diff --git a/rules/docker-base.mk b/rules/docker-base.mk
index 55e44e7f3447..523b64c29181 100644
--- a/rules/docker-base.mk
+++ b/rules/docker-base.mk
@@ -7,7 +7,7 @@ $(DOCKER_BASE)_DEPENDS += $(LIBWRAP)
 $(DOCKER_BASE)_DEPENDS += $(BASH)
 $(DOCKER_BASE)_DEPENDS += $(SOCAT)
 
-ifeq ($(SONIC_INSTALL_DEBUG_TOOLS),y)
+ifeq ($(INSTALL_DEBUG_TOOLS),y)
 GDB = gdb
 VIM = vim
 OPENSSH = openssh-client
diff --git a/slave.mk b/slave.mk
index e88352f7cbdb..ba146b20a111 100644
--- a/slave.mk
+++ b/slave.mk
@@ -74,6 +74,10 @@ ifeq ($(SONIC_ENABLE_SYNCD_RPC),y)
 ENABLE_SYNCD_RPC = y
 endif
 
+ifeq ($(SONIC_INSTALL_DEBUG_TOOLS),y)
+INSTALL_DEBUG_TOOLS = y
+endif
+
 include $(RULES_PATH)/config
 include $(RULES_PATH)/functions
 include $(RULES_PATH)/*.mk
@@ -128,7 +132,7 @@ $(info "PASSWORD"                        : "$(PASSWORD)")
 $(info "ENABLE_DHCP_GRAPH_SERVICE"       : "$(ENABLE_DHCP_GRAPH_SERVICE)")
 $(info "SHUTDOWN_BGP_ON_START"           : "$(SHUTDOWN_BGP_ON_START)")
 $(info "ENABLE_PFCWD_ON_START"           : "$(ENABLE_PFCWD_ON_START)")
-$(info "SONIC_INSTALL_DEBUG_TOOLS"       : "$(SONIC_INSTALL_DEBUG_TOOLS)")
+$(info "INSTALL_DEBUG_TOOLS"             : "$(INSTALL_DEBUG_TOOLS)")
 $(info "ROUTING_STACK"                   : "$(SONIC_ROUTING_STACK)")
 $(info "ENABLE_SYNCD_RPC"                : "$(ENABLE_SYNCD_RPC)")
 $(info "ENABLE_ORGANIZATION_EXTENSIONS"  : "$(ENABLE_ORGANIZATION_EXTENSIONS)")