Another attempt at getting the yaml right