Tweak docker config a bit more to avoid random container stop/remove issues