[CDF-238] - Reviewing build process