diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index 098488a..19e776e 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -1,14 +1,15 @@
-name: Build wheels
+name: Build and upload wheels
 
 on:
   workflow_dispatch:
-  pull_request:
-  push:
-    branches:
-      - maya/modernize-build
-  release:
-    types:
-      - published
+    inputs:
+      job:
+        description: "Job to run"
+        required: true
+        default: "build_wheels"
+        options:
+          - build_wheels
+          - publish_test
 
 jobs:
   build_wheels:
@@ -20,6 +21,11 @@ jobs:
         os: [ubuntu-latest, macos-13, macos-14]
 
     steps:
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.8
+        if: runner.os == 'macOS' && runner.arch == 'ARM64'
+
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Fetch full history, necessary for git describe in setup.py
@@ -44,3 +50,27 @@ jobs:
         with:
           name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
+
+  publish_test:
+    name: Publish Python 🐍 distribution 📦 to TestPyPI
+    needs:
+      - build
+    runs-on: ubuntu-latest
+
+    environment:
+      name: testpypi
+      url: https://test.pypi.org/p/charm4py
+
+    permissions:
+      id-token: write # IMPORTANT: mandatory for trusted publishing
+
+    steps:
+      - name: Download all the dists
+        uses: actions/download-artifact@v3
+        with:
+          name: python-package-distributions
+          path: dist/
+      - name: Publish distribution 📦 to TestPyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/