Fix issue with archs for CI