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