diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index e147b2bf..fbffbb6b 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -24,6 +24,7 @@ jobs:
         env:
           CIBW_ARCHS_LINUX: auto
           CIBW_ARCHS_MACOS: x86_64 arm64
+          CIBW_TEST_SKIP: '*-macosx_arm64'
 
       - uses: actions/upload-artifact@v3
         with:
diff --git a/build_tools/prepare_macos_wheel.sh b/build_tools/prepare_macos_wheel.sh
index a7c7a43d..6f8c8c35 100644
--- a/build_tools/prepare_macos_wheel.sh
+++ b/build_tools/prepare_macos_wheel.sh
@@ -1,12 +1,11 @@
 #!/bin/bash
 
-set -e
-set -x
+set -exuo pipefail
 
-if [[ "$CIBW_BUILD" == *-macosx_arm64 ]]; then
+if [[ "${ARCHFLAGS:-}" == *arm64 ]]; then
     CONDA_CHANNEL="conda-forge/osx-arm64"
 else
     CONDA_CHANNEL="conda-forge/osx-64"
 fi
 
-conda create -n build -c $CONDA_CHANNEL jemalloc-local xsimd llvm-openmp
+conda create -y -n build -c $CONDA_CHANNEL jemalloc-local xsimd llvm-openmp