diff --git a/platform/broadcom/docker-orchagent-brcm.mk b/platform/broadcom/docker-orchagent-brcm.mk
index c847d93b74..646626ff89 100644
--- a/platform/broadcom/docker-orchagent-brcm.mk
+++ b/platform/broadcom/docker-orchagent-brcm.mk
@@ -5,3 +5,13 @@ $(DOCKER_ORCHAGENT_BRCM)_PATH = $(DOCKERS_PATH)/docker-orchagent
 $(DOCKER_ORCHAGENT_BRCM)_DEPENDS += $(SWSS) $(REDIS_TOOLS)
 $(DOCKER_ORCHAGENT_BRCM)_LOAD_DOCKERS += $(DOCKER_BASE)
 SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_BRCM)
+SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_BRCM)
+
+$(DOCKER_ORCHAGENT_BRCM)_CONTAINER_NAME = swss
+$(DOCKER_ORCHAGENT_BRCM)_RUN_OPT += --net=host --privileged -t
+$(DOCKER_ORCHAGENT_BRCM)_RUN_OPT += --volumes-from database
+$(DOCKER_ORCHAGENT_BRCM)_RUN_OPT += -v /etc/ssw/:/etc/ssw/:ro
+$(DOCKER_ORCHAGENT_BRCM)_RUN_OPT += -v /etc/network/interfaces:/etc/network/interfaces:ro
+$(DOCKER_ORCHAGENT_BRCM)_RUN_OPT += -v /etc/network/interfaces.d/:/etc/network/interfaces.d/:ro
+$(DOCKER_ORCHAGENT_BRCM)_RUN_OPT += -v /host/machine.conf:/host/machine.conf
+$(DOCKER_ORCHAGENT_BRCM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
diff --git a/platform/broadcom/docker-syncd-brcm.mk b/platform/broadcom/docker-syncd-brcm.mk
index e1f02c59fa..870cba30c8 100644
--- a/platform/broadcom/docker-syncd-brcm.mk
+++ b/platform/broadcom/docker-syncd-brcm.mk
@@ -6,3 +6,10 @@ $(DOCKER_SYNCD_BRCM)_DEPENDS += $(SYNCD)
 $(DOCKER_SYNCD_BRCM)_FILES += $(DSSERVE) $(BCMCMD)
 $(DOCKER_SYNCD_BRCM)_LOAD_DOCKERS += $(DOCKER_BASE)
 SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BRCM)
+SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BRCM)
+
+$(DOCKER_SYNCD_BRCM)_CONTAINER_NAME = syncd
+$(DOCKER_SYNCD_BRCM)_RUN_OPT += --net=host --privileged -t
+$(DOCKER_SYNCD_BRCM)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
+$(DOCKER_SYNCD_BRCM)_RUN_OPT += --volumes-from database
+$(DOCKER_SYNCD_BRCM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
diff --git a/platform/cavium/docker-orchagent-cavm.mk b/platform/cavium/docker-orchagent-cavm.mk
index b66c7dbf03..9befdb11e8 100644
--- a/platform/cavium/docker-orchagent-cavm.mk
+++ b/platform/cavium/docker-orchagent-cavm.mk
@@ -5,3 +5,13 @@ $(DOCKER_ORCHAGENT_CAVM)_PATH = $(DOCKERS_PATH)/docker-orchagent
 $(DOCKER_ORCHAGENT_CAVM)_DEPENDS += $(SWSS) $(REDIS_TOOLS)
 $(DOCKER_ORCHAGENT_CAVM)_LOAD_DOCKERS += $(DOCKER_BASE)
 SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_CAVM)
+SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_CAVM)
+
+$(DOCKER_ORCHAGENT_CAVM)_CONTAINER_NAME = swss
+$(DOCKER_ORCHAGENT_CAVM)_RUN_OPT += --net=host --privileged -t
+$(DOCKER_ORCHAGENT_CAVM)_RUN_OPT += --volumes-from database
+$(DOCKER_ORCHAGENT_CAVM)_RUN_OPT += -v /etc/ssw/:/etc/ssw/:ro
+$(DOCKER_ORCHAGENT_CAVM)_RUN_OPT += -v /etc/network/interfaces:/etc/network/interfaces:ro
+$(DOCKER_ORCHAGENT_CAVM)_RUN_OPT += -v /etc/network/interfaces.d/:/etc/network/interfaces.d/:ro
+$(DOCKER_ORCHAGENT_CAVM)_RUN_OPT += -v /host/machine.conf:/host/machine.conf
+$(DOCKER_ORCHAGENT_CAVM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
diff --git a/platform/cavium/docker-syncd-cavm.mk b/platform/cavium/docker-syncd-cavm.mk
index ec410ca305..b6efd184bd 100644
--- a/platform/cavium/docker-syncd-cavm.mk
+++ b/platform/cavium/docker-syncd-cavm.mk
@@ -5,3 +5,10 @@ $(DOCKER_SYNCD_CAVM)_PATH = $(PLATFORM_PATH)/docker-syncd-cavm
 $(DOCKER_SYNCD_CAVM)_DEPENDS += $(SYNCD) $(CAVM_LIBSAI) $(XP_TOOLS) $(REDIS_TOOLS)
 $(DOCKER_SYNCD_CAVM)_LOAD_DOCKERS += $(DOCKER_BASE)
 SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_CAVM)
+SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_CAVM)
+
+$(DOCKER_SYNCD_CAVM)_CONTAINER_NAME = syncd
+$(DOCKER_SYNCD_CAVM)_RUN_OPT += --net=host --privileged -t
+$(DOCKER_SYNCD_CAVM)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
+$(DOCKER_SYNCD_CAVM)_RUN_OPT += --volumes-from database
+$(DOCKER_SYNCD_CAVM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro