diff --git a/platform/broadcom/docker-saiserver-brcm.mk b/platform/broadcom/docker-saiserver-brcm.mk
index b754ab6798..d587a39ba2 100644
--- a/platform/broadcom/docker-saiserver-brcm.mk
+++ b/platform/broadcom/docker-saiserver-brcm.mk
@@ -6,6 +6,7 @@ $(DOCKER_SAISERVER_BRCM)_DEPENDS += $(SAISERVER)
 $(DOCKER_SAISERVER_BRCM)_FILES += $(DSSERVE) $(BCMCMD)
 $(DOCKER_SAISERVER_BRCM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
 SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_BRCM)
+SONIC_STRETCH_DOCKERS += $(DOCKER_SAISERVER_BRCM)
 
 $(DOCKER_SAISERVER_BRCM)_CONTAINER_NAME = saiserver
 $(DOCKER_SAISERVER_BRCM)_RUN_OPT += --net=host --privileged -t
diff --git a/platform/marvell-arm64/docker-saiserver-mrvl.mk b/platform/marvell-arm64/docker-saiserver-mrvl.mk
index 07dac2a461..a449e3e83e 100644
--- a/platform/marvell-arm64/docker-saiserver-mrvl.mk
+++ b/platform/marvell-arm64/docker-saiserver-mrvl.mk
@@ -5,6 +5,7 @@ $(DOCKER_SAISERVER_MRVL)_PATH = $(PLATFORM_PATH)/docker-saiserver-mrvl
 $(DOCKER_SAISERVER_MRVL)_DEPENDS += $(SAISERVER)
 $(DOCKER_SAISERVER_MRVL)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
 SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_MRVL)
+SONIC_STRETCH_DOCKERS += $(DOCKER_SAISERVER_MRVL)
 
 $(DOCKER_SAISERVER_MRVL)_CONTAINER_NAME = saiserver
 $(DOCKER_SAISERVER_MRVL)_RUN_OPT += --net=host --privileged -t
diff --git a/platform/marvell-armhf/docker-saiserver-mrvl.mk b/platform/marvell-armhf/docker-saiserver-mrvl.mk
index 398902961d..8720e33646 100644
--- a/platform/marvell-armhf/docker-saiserver-mrvl.mk
+++ b/platform/marvell-armhf/docker-saiserver-mrvl.mk
@@ -6,6 +6,7 @@ $(DOCKER_SAISERVER_MRVL)_DEPENDS += $(SAISERVER)
 $(DOCKER_SAISERVER_MRVL)_FILES += $(DSSERVE) $(BCMCMD)
 $(DOCKER_SAISERVER_MRVL)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
 SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_MRVL)
+SONIC_STRETCH_DOCKERS += $(DOCKER_SAISERVER_MRVL)
 
 $(DOCKER_SAISERVER_MRVL)_CONTAINER_NAME = saiserver
 $(DOCKER_SAISERVER_MRVL)_RUN_OPT += --net=host --privileged -t
diff --git a/platform/mellanox/docker-saiserver-mlnx.mk b/platform/mellanox/docker-saiserver-mlnx.mk
index d91756a1f2..6515fa9846 100644
--- a/platform/mellanox/docker-saiserver-mlnx.mk
+++ b/platform/mellanox/docker-saiserver-mlnx.mk
@@ -6,6 +6,7 @@ $(DOCKER_SAISERVER_MLNX)_DEPENDS += $(SAISERVER) $(PYTHON_SDK_API)
 $(DOCKER_SAISERVER_MLNX)_PYTHON_DEBS += $(MLNX_SFPD)
 $(DOCKER_SAISERVER_MLNX)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
 SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_MLNX)
+SONIC_STRETCH_DOCKERS += $(DOCKER_SAISERVER_MLNX)
 
 $(DOCKER_SAISERVER_MLNX)_CONTAINER_NAME = saiserver
 $(DOCKER_SAISERVER_MLNX)_RUN_OPT += --net=host --privileged -t