[CDF-238] - Still tweaking builds