move to new vendor config

Change-Id: I9661bb57e07b943c894291f23ae7605cf47c3dd9