move to new vendor config

Change-Id: I9659f241b141a414e258e8fbb4a67ad984e78cbb