Config updates to fix integration builds