diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 72889a2..70ebe65 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -12,7 +12,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # see https://github.com/actions/runner-images#available-images
         os: [macos-14, ubuntu-latest]
         python-version: ['3.12']
 
@@ -28,11 +27,15 @@ jobs:
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
           submodules: true
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        if: matrix.os == 'ubuntu-latest'
+
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.21.3
+        run: python -m pip install cibuildwheel==2.21.3 setuptools==75.3.0
 
       - name: Build wheels
-        run: python -m cibuildwheel --output-dir wheelhouse
+        run: cibuildwheel --config-file pyproject.toml --output-dir wheelhouse
 
       - name: Build sdist
         if: ${{ matrix.os == 'ubuntu-latest' }}
@@ -42,7 +45,7 @@ jobs:
         run: ls -l ./wheelhouse
 
       - name: Upload
-        if: ${{ github.ref_name == 'master' }}
+        if: github.ref == 'refs/heads/master'
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 8eadbb5..9a619ac 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -1,15 +1,15 @@
 ---
 
 name: Validate
-on: push
+on: [ push, pull_request, workflow_dispatch ]
 
 jobs:
   validate:
     name: Syntax check all code in repository
-    runs-on: ubuntu-latest
-
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
+        os: [macos-14, macos-14, ubuntu-latest]
         python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
@@ -27,3 +27,4 @@ jobs:
         run: |
           python3 -m pip install -U pip
           python3 -m pip install .
+          python3 -c "import judy"