Update clusterdefinitions to match new JSON format