diff --git a/.github/workflows/ci-cd-workflow.yml b/.github/workflows/ci-cd-workflow.yml
index 1045f73f..59d362a4 100644
--- a/.github/workflows/ci-cd-workflow.yml
+++ b/.github/workflows/ci-cd-workflow.yml
@@ -60,7 +60,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest"]
-        python-version: ["3.9", "3.11"]
+        python-version: ["3.9", "3.11", "3.12"]
     defaults:
       run:
         shell: bash -l {0}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index cebf85c5..f1cbeeb6 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -31,6 +31,12 @@ Breaking changes
   xarray       not specified >=2023.04
   ============ ============= =========
 
+New Features
+^^^^^^^^^^^^
+
+- Add python 3.12 to list of supported versions (`#368 <https://github.com/MESMER-group/mesmer/pull/368>`_).
+  By `Mathias Hauser`_.
+
 v0.9.0 - 2023.12.19
 -------------------
 
diff --git a/setup.cfg b/setup.cfg
index 39b62d00..e7dfb348 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,6 +22,7 @@ classifiers =
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
     Topic :: Scientific/Engineering
     Topic :: Scientific/Engineering :: Atmospheric Science