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