WIP fixing cloudinit yaml changes