Merge "[HELM] Uses new tpls for repos / images"