MC-91: Make readable yml files