Merge "[COMMON][POSTGRES] Uses new tpls for repos / images"