move to new vendor config

Change-Id: I873a9b4f8f7f74da7a7aefef6dab9811843a01fe