move to new vendor config

Change-Id: I9a94a2713469710adb252a0d56b9e0685125c741