Fix flows for official and non-official builds