more build ci fixes

+review REVIEW-5263