move to new vendor config

Change-Id: I3e7864e2d7bbba31c01370fbd153bc4370dc1b0f