diff --git a/.gitignore b/.gitignore
index 27fdd02..ba31c93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+# -*- makefile -*-
+
 # local chart repo dir used when building the http-accessible repo
 chart_repo
 
@@ -14,12 +16,20 @@
 # should be working in a temp dir -vs- (read-only) checkout dir.
 tagcollisionreject.tmp.sh
 
-# helm-repo-tools is cloned in the Makefile if not present
+# ---------------------------
+# Repositories cloned locally
+# ---------------------------
+cord-charts-repo/
 helm-repo-tools/
 
+# ----------
 # misc files
+# ----------
 .*.swp
+*~
 .remote-sync.json
 .DS_Store
 #Idea
 .idea/
+
+# [EOF]
diff --git a/Makefile b/Makefile
index cd9c485..2798925 100644
--- a/Makefile
+++ b/Makefile
@@ -68,12 +68,6 @@
 test-tags: tagcollisionreject.sh
 	@bash ./tagcollisionreject.sh
 
-## -----------------------------------------------------------------------
-## [NOTE] moving to makefiles/lint/helm/include.mk
-## -----------------------------------------------------------------------
-helm-repo-tools:
-	git clone "https://gerrit.opencord.org/helm-repo-tools"
-
 lint-local: lint-helm lint-chart
 
 # lint-helm:
@@ -92,7 +86,6 @@
 ## -----------------------------------------------------------------------
 ## -----------------------------------------------------------------------
 clean :: # @HELP Removes all files downloaded to run the tests
-	$(RM) -r helm-repo-tools
 	$(RM) tagcollisionreject.*
 
 # [EOF]
diff --git a/VERSION b/VERSION
index 6d7d659..8781035 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.3.0-dev
+3.3.0-dev2
diff --git a/makefiles/lint/helm/helmrepo.mk b/makefiles/lint/helm/helmrepo.mk
new file mode 100644
index 0000000..1961399
--- /dev/null
+++ b/makefiles/lint/helm/helmrepo.mk
@@ -0,0 +1,59 @@
+# -*- makefile -*-
+# -----------------------------------------------------------------------
+# Copyright 2023 Open Networking Foundation (ONF) and the ONF Contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -----------------------------------------------------------------------
+
+##-------------------##
+##---]  GLOBALS  [---##
+##-------------------##
+
+##-------------------##
+##---]  TARGETS  [---##
+##-------------------##
+.PHONY: lint-helmrepo
+
+ifndef NO-LINT-HELMREPO
+  lint : lint-helmrepo
+endif
+
+## -----------------------------------------------------------------------
+## Intent: Jenkins hook test
+## -----------------------------------------------------------------------
+lint-helmrepo-deps += cord-charts-repo
+lint-helmrepo-deps += lint-helm
+lint-helmrepo: $(lint-helmrepo-deps)
+	$(HIDE) $(MAKE) helm-repo-tools
+	helm-repo-tools/helmrepo.sh --no-publish
+
+## -----------------------------------------------------------------------
+## Intent: Dependency for lint-helmrepo
+## -----------------------------------------------------------------------
+cord-charts-repo:
+	git clone ssh://gerrit.opencord.org:29418/cord-charts-repo.git
+
+## -----------------------------------------------------------------------
+## Intent: Checkout lint tools
+## -----------------------------------------------------------------------
+helm-repo-tools:
+	git clone "https://gerrit.opencord.org/helm-repo-tools"
+
+## -----------------------------------------------------------------------
+## Intent: Revert to a pristine sandbox checkout
+## ----------------------------------------------------------------------
+sterile ::
+	$(RM) -r cord-charts-repo
+	$(RM) -r helm-repo-tools
+
+# [EOF]
diff --git a/makefiles/lint/helm/include.mk b/makefiles/lint/helm/include.mk
index b430d48..1c63061 100644
--- a/makefiles/lint/helm/include.mk
+++ b/makefiles/lint/helm/include.mk
@@ -27,6 +27,7 @@
 include $(MAKEDIR)/lint/helm/branch-detect.mk
 include $(MAKEDIR)/lint/helm/chart.mk
 include $(MAKEDIR)/lint/helm/helm.mk
+include $(MAKEDIR)/lint/helm/helmrepo.mk
 
 ##-------------------##
 ##---]  TARGETS  [---##