make yaml files consistent
use new yaml format
use new yaml format