diff --git a/rules/sonic-device-data.dep b/rules/sonic-device-data.dep
index c6105f939f..325b1492ab 100644
--- a/rules/sonic-device-data.dep
+++ b/rules/sonic-device-data.dep
@@ -3,6 +3,7 @@ SPATH       := $($(SONIC_DEVICE_DATA)_SRC_PATH)
 DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/sonic-device-data.mk rules/sonic-device-data.dep   
 DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
 DEP_FILES   += $(shell git ls-files $(SPATH))
+DEP_FILES   += $(shell find device -type l -prune -o -type f -print )
 
 $(SONIC_DEVICE_DATA)_CACHE_MODE := GIT_CONTENT_SHA
 $(SONIC_DEVICE_DATA)_DEP_FLAGS  := $(SONIC_COMMON_FLAGS_LIST)
diff --git a/rules/sonic-yang-models-py3.dep b/rules/sonic-yang-models-py3.dep
new file mode 100644
index 0000000000..34b8c785f4
--- /dev/null
+++ b/rules/sonic-yang-models-py3.dep
@@ -0,0 +1,9 @@
+SPATH       := $($(SONIC_YANG_MODELS_PY3)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/sonic-yang-models-py3.mk rules/sonic-yang-models-py3.dep   
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(SPATH))
+
+$(SONIC_YANG_MODELS_PY3)_CACHE_MODE  := GIT_CONTENT_SHA 
+$(SONIC_YANG_MODELS_PY3)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(SONIC_YANG_MODELS_PY3)_DEP_FILES   := $(DEP_FILES)
+