Update to match current build procedure