diff --git a/platform/vs/kvm-image.mk b/platform/vs/kvm-image.mk
index 4c1cdd18b0d6..90073749db55 100644
--- a/platform/vs/kvm-image.mk
+++ b/platform/vs/kvm-image.mk
@@ -3,6 +3,11 @@
 SONIC_KVM_IMAGE = sonic-vs.img.gz
 $(SONIC_KVM_IMAGE)_MACHINE = vs
 $(SONIC_KVM_IMAGE)_IMAGE_TYPE = kvm
-$(SONIC_KVM_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES)
+ifeq ($(INSTALL_DEBUG_TOOLS),y)
+$(SONIC_KVM_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_DBG_IMAGES)
+$(SONIC_KVM_IMAGE)_DOCKERS += $(filter-out $(patsubst %-$(DBG_IMAGE_MARK).gz,%.gz, $(SONIC_INSTALL_DOCKER_DBG_IMAGES)), $(SONIC_INSTALL_DOCKER_IMAGES))
+else
+$(SONIC_KVM_IMAGE)_DOCKERS = $(SONIC_INSTALL_DOCKER_IMAGES)
+endif
 $(SONIC_KVM_IMAGE)_FILES = $(ONIE_RECOVERY_IMAGE)
 SONIC_INSTALLERS += $(SONIC_KVM_IMAGE)