diff --git a/rules/docker-base.mk b/rules/docker-base.mk
index 891518790..2d0653fc8 100644
--- a/rules/docker-base.mk
+++ b/rules/docker-base.mk
@@ -8,11 +8,12 @@ $(DOCKER_BASE)_DEPENDS += $(SOCAT)
 
 ifeq ($(INSTALL_DEBUG_TOOLS),y)
 GDB = gdb
+GDBSERVER = gdbserver
 VIM = vim
 OPENSSH = openssh-client
 SSHPASS = sshpass
 STRACE = strace
-$(DOCKER_BASE)_DBG_PACKAGES += $(GDB) $(VIM) $(OPENSSH) $(SSHPASS) $(STRACE)
+$(DOCKER_BASE)_DBG_PACKAGES += $(GDB) $(GDBSERVER) $(VIM) $(OPENSSH) $(SSHPASS) $(STRACE)
 endif
 
 SONIC_DOCKER_IMAGES += $(DOCKER_BASE)