move to new vendor config

Change-Id: Iaea289779901c725db81fc4e7a0cc25d5bce49ce