Move to build-targets for vendorsetup - pulled from CM