Docker kickstart fixes