Reorganised Docker build settings