diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 54495729..ef280e58 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -17,6 +17,11 @@ jobs:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11"]
         django-version: ["3.2", "4.1", "4.2", "5.0"]
+        include:
+        - python-version: "3.12"
+          django-version: "4.2"
+        - python-version: "3.12"
+          django-version: "5.0"
         exclude:
         - python-version: "3.11"
           django-version: "3.2"
@@ -26,11 +31,12 @@ jobs:
           django-version: "5.0"
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
+        allow-prereleases: true
     - name: Install dependencies and testing utilities
       run: |
         sudo apt-get update && sudo apt-get install xmlsec1
diff --git a/README.md b/README.md
index 3d688405..9af17f6c 100644
--- a/README.md
+++ b/README.md
@@ -4,10 +4,10 @@ djangosaml2
 ![CI build](https://github.com/peppelinux/djangosaml2/workflows/djangosaml2/badge.svg)
 ![pypi](https://img.shields.io/pypi/v/djangosaml2.svg)
 [![Downloads](https://pepy.tech/badge/djangosaml2/month)](https://pepy.tech/project/djangosaml2)
-![Python version](https://img.shields.io/badge/license-Apache%202-blue.svg)
-![Django versions](https://img.shields.io/pypi/djversions/djangosaml2)
 ![Documentation Status](https://readthedocs.org/projects/djangosaml2/badge/?version=latest)
-![License](https://img.shields.io/badge/python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11-blue.svg)
+![License](https://img.shields.io/badge/license-Apache%202-blue.svg)
+![Python versions](https://img.shields.io/pypi/pyversions/djangosaml2)
+![Django versions](https://img.shields.io/pypi/djversions/djangosaml2)
 
 
 A Django application that builds a Fully Compliant SAML2 Service Provider on top of PySAML2 library.
diff --git a/setup.py b/setup.py
index 2d33cdee..ab0d7e0d 100644
--- a/setup.py
+++ b/setup.py
@@ -47,6 +47,7 @@ def read(*rnames):
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI",
         "Topic :: Security",
diff --git a/tox.ini b/tox.ini
index 8830d972..06f57b11 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{3.8,3.9,3.10,3.11}-django{3.2,4.1,4.2,5.0}
+    py{3.8,3.9,3.10,3.11,3.12}-django{3.2,4.1,4.2,5.0}
 
 [testenv]
 commands =