diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml
index 82140eae6..86cac340c 100644
--- a/.github/workflows/ci-testing.yml
+++ b/.github/workflows/ci-testing.yml
@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.9, '3.10', '3.11']
+        python-version: [3.9, '3.10', '3.11', '3.12']
         shapely-dev: [false]
         include:
           - os: ubuntu-latest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8fb9c6b78..326ac1d12 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,6 +9,14 @@ on:
   release:
     types:
       - published
+  # Also allow running this action on PRs if requested by applying the
+  # "Run cibuildwheel" label.
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - labeled
 
 jobs:
   build_sdist:
@@ -49,6 +57,17 @@ jobs:
           if-no-files-found: error
 
   generate-wheels-matrix:
+    if: |
+      github.event_name == 'release' ||
+      (github.event_name == 'pull_request' && (
+        (
+          github.event.action == 'labeled' &&
+          github.event.label.name == 'CI: build wheels'
+        ) ||
+        contains(github.event.pull_request.labels.*.name,
+                'CI: build wheels')
+        )
+      )
     name: Generate wheels matrix
     runs-on: ubuntu-latest
     outputs:
@@ -72,8 +91,8 @@ jobs:
           echo "include=$MATRIX" >> $GITHUB_OUTPUT
         env:
           CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-*"
-          # Skip 32 bit windows builds and musllinux due to lack of numpy wheels
-          CIBW_SKIP: "*-win32 *-musllinux*"
+          # Skip 32 bit builds and musllinux due to lack of numpy wheels
+          CIBW_SKIP: "*-win32 *_i686 *-musllinux*"
           CIBW_ARCHS_MACOS: x86_64 arm64
 
   build_wheels:
diff --git a/pyproject.toml b/pyproject.toml
index f2ffe48af..0faffca80 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -33,6 +33,7 @@ classifiers = [
     'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: 3.11',
+    'Programming Language :: Python :: 3.12',
     'Programming Language :: Python :: 3 :: Only',
     'Topic :: Scientific/Engineering',
     'Topic :: Scientific/Engineering :: GIS',