Update YAML format across the board