correct the yaml structure
WIP: