diff --git a/.buildkite/linux/entrypoint b/.buildkite/linux/entrypoint
index 1cb52cd8f..9ddba1eb5 100755
--- a/.buildkite/linux/entrypoint
+++ b/.buildkite/linux/entrypoint
@@ -7,7 +7,7 @@ echo "--- Checking CONTRIBUTORS"
 .buildkite/linux/check_contributors
 
 BAZEL="bazel --output_user_root=/state/bazel --output_base=/state/bazel/anki"
-BUILDARGS="--config=ci --experimental_convenience_symlinks=ignore --disk_cache=/state/bazel/disk --repository_cache=/state/bazel/repo"
+BUILDARGS="--config=ci --disk_cache=/state/bazel/disk --repository_cache=/state/bazel/repo"
 
 echo "+++ Building and testing"
 
@@ -16,9 +16,6 @@ test -e /state/node_modules && mv /state/node_modules .
 
 $BAZEL test $BUILDARGS ... //rslib/linkchecker
 
-echo "--- Building wheels"
-$BAZEL build dist
-
 echo "--- Running lints"
 python scripts/copyright_headers.py
 
diff --git a/.buildkite/mac/entrypoint b/.buildkite/mac/entrypoint
index 71fa41e22..4eafed2c8 100755
--- a/.buildkite/mac/entrypoint
+++ b/.buildkite/mac/entrypoint
@@ -14,6 +14,8 @@ test -e $STATE/node_modules && mv $STATE/node_modules .
 
 $BAZEL test $BUILDARGS ...
 
-echo "--- Cleanup"
+echo "--- Building wheels"
+$BAZEL build dist
+
 # if tests succeed, back up node_modules folder
 mv node_modules $STATE/