diff --git a/makefiles/lint/yaml/include.mk b/makefiles/lint/yaml/include.mk
index 28fe608..7518d51 100644
--- a/makefiles/lint/yaml/include.mk
+++ b/makefiles/lint/yaml/include.mk
@@ -28,7 +28,7 @@
 ##---]  INCLUDES  [---##
 ##--------------------##
 include $(ONF_MAKEDIR)/lint/yaml/help.mk
-include $(ONF_MAKEDIR)/lint/yaml/find_utils.mk
+# include $(ONF_MAKEDIR)/lint/yaml/find_utils.mk
 include $(ONF_MAKEDIR)/lint/yaml/install.mk
 
 # [TODO] Consolidate and refactor to support a simpler answer
diff --git a/makefiles/lint/yaml/yamllint.mk b/makefiles/lint/yaml/yamllint.mk
index ed0df2c..f8c2f7f 100644
--- a/makefiles/lint/yaml/yamllint.mk
+++ b/makefiles/lint/yaml/yamllint.mk
@@ -33,6 +33,11 @@
 YAMLLINT = $(activate) && yamllint
 yamllint-args += --strict
 
+yaml-find-args := $(null)
+yaml-find-args += $(foreach dir,$(onf-excl-dirs),-not -path './$(dir)/*')
+yaml-find-args += -a \( -iname '*.yaml' -o -iname '*.yml' \)
+yaml-find-args += -print0
+
 ## -----------------------------------------------------------------------
 ## Intent: Use the yaml command to perform syntax checking.
 ## -----------------------------------------------------------------------
@@ -49,7 +54,8 @@
 
 	$(call banner-enter,Target $@)
 	$(HIDE)$(MAKE) --no-print-directory lint-yaml-install
-	$(HIDE)$(activate) && $(call gen-yaml-find-cmd) \
+
+	$(HIDE)$(activate) && find . $(yaml-find-args) \
 	    | $(env-clean) $(xargs-cmd) -I'{}' \
 		bash -c "$(YAMLLINT) $(yamllint-args) {}"
 	$(call banner-leave,Target $@)