move to new vendor config

Change-Id: I527b04c0f8e9833c79e9288908e504c6947fc793