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