Migrate to kickstart and kickstart-baseline