[CLEANUP] - Refactored build to be CI compliant