diff --git a/.gitignore b/.gitignore
index 05567ce..7873c22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
 # local chart repo dir used when building the http-accessible repo
 chart_repo
 
-# helm-repo-tools repo (in case of local testing)
-helm-repo-tools/
-
 # lockfiles for requirements.yaml for dependent charts
 requirements.lock
 Chart.lock
@@ -11,6 +8,12 @@
 # sub charts directories, created by helm dep ...
 charts
 
+# tagcollisionreject.sh is downloaded via the Makefile if not present
+tagcollisionreject.sh
+
+# helm-repo-tools is cloned in the Makefile if not present
+helm-repo-tools/
+
 # misc files
 .*.swp
 .remote-sync.json
diff --git a/.gitreview b/.gitreview
index 2b11b97..b6f18ed 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,3 +3,4 @@
 port=29418
 project=voltha-helm-charts.git
 defaultremote=origin
+defaultbranch=master
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..04819c4
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,44 @@
+# Copyright 2021-present Open Networking Foundation
+#
+# 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.
+
+branch=`cat .gitreview | grep branch | cut -d '=' -f2`
+
+help: # @HELP Print the command options
+	@echo
+	@echo "\033[0;31m    VOLTHA HELM CHARTS \033[0m"
+	@echo
+	@grep -E '^.*: .* *# *@HELP' $(MAKEFILE_LIST) \
+    | sort \
+    | awk ' \
+        BEGIN {FS = ": .* *# *@HELP"}; \
+        {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}; \
+    '
+
+tagcollisionreject.sh:
+	@curl -o tagcollisionreject.tmp.sh https://raw.githubusercontent.com/opencord/ci-management/master/jjb/shell/tagcollisionreject.sh
+	@echo 6dc8352d47f415e003dbddc30ede194ca304907d25f1c2a384f928083194860f tagcollisionreject.tmp.sh | sha256sum --check
+	@mv tagcollisionreject.tmp.sh	tagcollisionreject.sh
+
+test-tags: tagcollisionreject.sh
+	@bash ./tagcollisionreject.sh
+
+helm-repo-tools:
+	git clone "https://gerrit.opencord.org/helm-repo-tools"
+
+test: test-tags helm-repo-tools # @HELP Makes sure the versions used in the charts are valid
+	@COMPARISON_BRANCH=origin/$(branch) ./helm-repo-tools/chart_version_check.sh
+
+clean: # @HELP Removes all files downloaded to run the tests
+	rm -rf helm-repo-tools
+	rm tagcollisionreject.*