Move to oct vendor