Deploy OSD and refactored includes