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