xZero707 Optimize build stage