Updating yaml to the new format