diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index d9479cc4..9afe8d96 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -17,6 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         python:
+          - '3.12'
           - '3.11'
           - '3.10'
           - '3.9'
@@ -75,7 +76,7 @@ jobs:
         uses: snok/install-poetry@v1
       - uses: actions/setup-python@v3
         with:
-          python-version: '3.11'
+          python-version: '3.12'
           cache: 'poetry'
       - name: Update apt repositories
         run: sudo apt update
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee7e74d7..7b007443 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ cache:
     - .venv
 
 style:
-  image: python:3.11
+  image: python:3.12
   stage: test
   script:
     - pip install pre-commit
@@ -50,6 +50,13 @@ python311:
     - poetry install --extras all
     - poetry run pytest
 
+python312:
+  image: python:3.12
+  stage: test
+  script:
+    - poetry install --extras all
+    - poetry run pytest
+
 minversions:
   image: python:3.8
   stage: test
@@ -61,14 +68,14 @@ minversions:
     - poetry run pytest
 
 doc:
-  image: python:3.11
+  image: python:3.12
   stage: test
   script:
     - poetry install --only doc
     - poetry run sphinx-build doc build/sphinx/html
 
 coverage:
-  image: python:3.11
+  image: python:3.12
   stage: test
   allow_failure: true
   script:
diff --git a/CHANGES.rst b/CHANGES.rst
index 30cce030..063a8333 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -21,6 +21,7 @@ Added
 - flask-babel and pytz are now part of the `front` extras
 - Bump to fomantic-ui 2.9.3 :pr:`152`
 - Bump to htmx 1.9.6 :pr:`154`
+- Add support for python 3.12 :pr:`155`
 
 [0.0.33] - 2023-08-26
 =====================
diff --git a/pyproject.toml b/pyproject.toml
index e70669c7..0124396f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,6 +16,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",
     "License :: OSI Approved :: MIT License",
     "Environment :: Web Environment",
@@ -170,6 +171,7 @@ envlist =
     py39
     py310
     py311
+    py312
     doc
     coverage