[Reviewer: Andy] [DON'T MERGE YET] Use new schema

Andy, please can you review **but not merge** my changes to chef to use the new schema?