Unify private and public builds