Fix init generator to simplify YAML