[RFR] Improve build process