diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
index 3ebee992b..c33b3d0a3 100644
--- a/.github/workflows/pythonpackage.yml
+++ b/.github/workflows/pythonpackage.yml
@@ -22,10 +22,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-13]
+        os: [ubuntu-latest, windows-latest, macos-latest]
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         exclude:
           - {os: windows-latest, python-version: "3.8"}
+          - {os: macos-latest, python-version: "3.8"}
 
     steps:
     - uses: actions/checkout@v2
@@ -56,6 +57,12 @@ jobs:
       if: startswith(matrix.os, 'macos')
       run: brew install libomp
 
+    # xcode 15.2 throws compilation errors ref https://github.com/vaexio/vaex/pull/2432
+    # select older xcode from the available versions on the runner ref https://github.com/actions/runner-images/blob/ff9acc6/images/macos/macos-13-Readme.md#xcode
+    - name: Switch to older Xcode (Mac-only)
+      if: startswith(matrix.os, 'macos')
+      run: sudo xcode-select -s "/Applications/Xcode_15.0.1.app"
+
     - name: Copy dll (Windows-only)
       if: (matrix.os == 'windows-latest')
       uses: ./ci/actions/windll
diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml
index 7941e0122..489fd23cc 100644
--- a/.github/workflows/wheel.yml
+++ b/.github/workflows/wheel.yml
@@ -38,7 +38,8 @@ jobs:
 
       - id: set-matrix
         env:
-          CIBW_SKIP: pp* cp38-win*
+          # skipping pypy for now, cp38-win was segfaulting on CI, numpy has no wheels for cp38-musllinux_aarch64 -> build from source -> CI timeouts
+          CIBW_SKIP: pp* cp38-win* cp38-musllinux_aarch64
         run: |
           MATRIX_INCLUDE=$(
             {
@@ -85,7 +86,9 @@ jobs:
       if: runner.os == 'Linux'
       uses: docker/setup-qemu-action@v3
 
-    - name: Switch to older Xcode
+    # xcode 15.2 throws compilation errors ref https://github.com/vaexio/vaex/pull/2432
+    # select older xcode from the available versions on the runner ref https://github.com/actions/runner-images/blob/ff9acc6/images/macos/macos-13-Readme.md#xcode
+    - name: Switch to older Xcode (Mac-only)
       if: startswith(matrix.os, 'macos')
       run: sudo xcode-select -s "/Applications/Xcode_15.0.1.app"