Transition from Docker fixes