Merge "[COMMON][Readiness] Uses new tpls for repos / images"