diff --git a/rules/config b/rules/config
index 04af59ccd818..0ebe2742d759 100644
--- a/rules/config
+++ b/rules/config
@@ -98,3 +98,6 @@ DEFAULT_VS_PREPARE_MEM = yes
 
 # ENABLE_SYSTEM_SFLOW - build docker-sonic-sflow for sFlow support
 ENABLE_SFLOW = y
+
+# ENABLE_TAM - build docker-tam for TAM related feature support
+ENABLE_TAM = n
diff --git a/rules/docker-tam.mk b/rules/docker-tam.mk
index 6c5a24c16cab..055c34a9756c 100644
--- a/rules/docker-tam.mk
+++ b/rules/docker-tam.mk
@@ -12,12 +12,16 @@ $(DOCKER_TAM)_DBG_DEPENDS += $(SONIC_TAM) $(PROTOBUF)
 $(DOCKER_TAM)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_IMAGE_PACKAGES)
 
 SONIC_DOCKER_IMAGES += $(DOCKER_TAM)
+ifeq ($(ENABLE_TAM), y)
 SONIC_STRETCH_DOCKERS += $(DOCKER_TAM)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_TAM)
+endif
 
 SONIC_DOCKER_DBG_IMAGES += $(DOCKER_TAM_DBG)
+ifeq ($(ENABLE_TAM), y)
 SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_TAM_DBG)
 SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_TAM_DBG)
+endif
 
 $(DOCKER_TAM)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_STRETCH)
 
diff --git a/slave.mk b/slave.mk
index dc13e43f62b2..1741f0aed2f9 100644
--- a/slave.mk
+++ b/slave.mk
@@ -112,6 +112,11 @@ ifeq ($(SONIC_ENABLE_SFLOW),y)
 ENABLE_SFLOW = y
 endif
 
+ifeq ($(SONIC_ENABLE_TAM),y)
+ENABLE_TAM = y
+endif
+
+
 include $(RULES_PATH)/functions
 include $(RULES_PATH)/*.mk
 ifneq ($(CONFIGURED_PLATFORM), undefined)
@@ -197,6 +202,7 @@ $(info "BUILD_TIMESTAMP"                 : "$(BUILD_TIMESTAMP)")
 $(info "BLDENV"                          : "$(BLDENV)")
 $(info "VS_PREPARE_MEM"                  : "$(VS_PREPARE_MEM)")
 $(info "ENABLE_SFLOW"                    : "$(ENABLE_SFLOW)")
+$(info "ENABLE_TAM"                      : "$(ENABLE_TAM)")
 $(info )
 
 ifeq ($(SONIC_USE_DOCKER_BUILDKIT),y)