Refactor CI builds, and build scripts to be more resilient, and effective