Merge "Update makefiles to use specific helm version"