Yet another attempt to solve the yaml errors