diff --git a/Makefile.cache b/Makefile.cache
index 9b6d6175780e..8f06161edda7 100644
--- a/Makefile.cache
+++ b/Makefile.cache
@@ -70,6 +70,7 @@ SONIC_COMMON_FILES_LIST :=  $(if $(wildcard cache.skip.common),, .platform slave
 SONIC_COMMON_FLAGS_LIST :=  $(CONFIGURED_PLATFORM) \
                             $(CONFIGURED_ARCH) \
                             $(BLDENV) \
+                            $(MIRROR_URLS) $(MIRROR_SECURITY_URLS) \
                             $(SONIC_DEBUGGING_ON) \
                             $(SONIC_PROFILING_ON) $(SONIC_ENABLE_SYNCD_RPC)
 SONIC_COMMON_DPKG_LIST  :=  debian/control debian/changelog debian/rules \
diff --git a/Makefile.work b/Makefile.work
index b048282d64b7..360433ce7922 100644
--- a/Makefile.work
+++ b/Makefile.work
@@ -207,6 +207,7 @@ $(shell $(PREPARE_DOCKER) )
 # Add the versions in the tag, if the version change, need to rebuild the slave
 SLAVE_BASE_TAG = $(shell \
 	cat $(SLAVE_DIR)/Dockerfile \
+		$(SLAVE_DIR)/sources.list.* \
 		$(SLAVE_DIR)/buildinfo/versions/versions-* \
 		src/sonic-build-hooks/hooks/* 2>/dev/null \
 	| sha1sum \