diff --git a/.github/workflows/pypi.yaml b/.github/workflows/pypi.yaml
index c5f11942..23ae3979 100644
--- a/.github/workflows/pypi.yaml
+++ b/.github/workflows/pypi.yaml
@@ -87,6 +87,10 @@ jobs:
         - ["cp39", "3.9"]
         - ["cp310", "3.10"]
         - ["cp311", "3.11"]
+        - ["cp312", "3.12"]
+        exclude:
+          - buildplat: [macos-latest, macosx_x86_64, macosx_10_14_x86_64]
+            version: ["cp312", "3.12"]
 
     steps:
       - uses: actions/checkout@v4
@@ -101,9 +105,15 @@ jobs:
           name: wheels
           path: dist
 
+      # TODO: Remove the manual h5py building once h5py 3.10 has been released with cp312 wheels
       - name: Install dependencies
         run: |
           WHL_NAME=$(python scripts/get_whl_name.py dist ${{ matrix.buildplat[2] }})
+          if [[ "${{ matrix.version }}" == '3.12' ]]; then
+            sudo apt-get update
+            sudo apt-get install libhdf5-dev
+            pip install git+https://github.com/h5py/h5py@89e1e2e78d7fb167d2a67c9a8354ced6491160fe
+          fi
           pip install "$WHL_NAME"[test] --prefer-binary
 
       - name: Python info
@@ -147,12 +157,12 @@ jobs:
       fail-fast: false
       matrix:
         buildplat:
-        - [ubuntu-latest, manylinux_aarch64]
+          - [ubuntu-latest, manylinux_aarch64]
         version:
-        - ["cp38", "python3.8"]
-        - ["cp39", "python3.9"]
-        - ["cp310", "python3.10"]
-        - ["cp311", "python3.11"]
+          - ["cp38", "python3.8"]
+          - ["cp39", "python3.9"]
+          - ["cp310", "python3.10"]
+          - ["cp311", "python3.11"]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/pyproject.toml b/pyproject.toml
index 430978a6..bb803439 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -39,6 +39,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 :: Implementation :: CPython",
     "Development Status :: 4 - Beta",
     "Intended Audience :: Science/Research",