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