Update goyaml and tomb location