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