diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f0e8333..7bb3a2b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
       max-parallel: 4
       fail-fast: False
       matrix:
-        python-version: [ "3.8", "3.9", "3.10", "3.11" ]
+        python-version: [ "3.9", "3.10", "3.11", "3.12" ]
     name: JIT compiled tests for Python ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v4
@@ -42,15 +42,14 @@ jobs:
         with:
           environment-name: test-env
           create-args: >-
-            python=${{ matrix.python-version }}
-            pip
-            root
+            python=${{ matrix.python-version }} pip ${{ matrix.python-version != '3.12' && 'root' || '' }}
       - name: Install Python dependencies
         run: |
           which python
           python -V
           python -m pip install uv
           python -m uv pip install -e ".[dev]"
+          python -m uv pip install git+https://github.com/HDembinski/numba-stats.git
       - name: Test with pytest
         run: |
           coverage run --source=. --omit=".tox/*" --branch -m pytest .
@@ -63,7 +62,7 @@ jobs:
       max-parallel: 4
       fail-fast: False
       matrix:
-        python-version: [ "3.8", "3.9", "3.10", "3.11" ]
+        python-version: [ "3.9", "3.10", "3.11", "3.12" ]
     name: Eager mode tests for Python ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v4
@@ -72,15 +71,14 @@ jobs:
         with:
           environment-name: test-env
           create-args: >-
-            python=${{ matrix.python-version }}
-            pip
-            root
+            python=${{ matrix.python-version }} pip ${{ matrix.python-version != '3.12' && 'root' || '' }}
       - name: Install Python dependencies
         run: |
           which python
           python -V
           python -m pip install uv
           python -m uv pip install -e ".[dev]"
+          python -m uv pip install git+https://github.com/HDembinski/numba-stats.git
       - name: Test with pytest
         run: |
           ZFIT_DO_JIT=0
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8f72038..861045a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -49,7 +49,7 @@ repos:
     rev: v2.5.0
     hooks:
       - id: setup-cfg-fmt
-        args: [ --max-py-version=3.10, --include-version-classifiers ]
+        args: [ --max-py-version=3.12, --include-version-classifiers ]
 
 
   # Notebook formatting
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 5b7dc20..863c091 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -12,6 +12,7 @@ Major Features and Improvements
 - added ErfExp PDF
 - added Novosibirsk PDF
 - added Tsallis PDF
+- upgrade to zfit>=0.20, support Python 3.9-3.12
 
 Breaking changes
 ------------------
diff --git a/requirements_dev.txt b/requirements_dev.txt
index 8505f77..fd71fd0 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -4,7 +4,7 @@ coverage>=4.5.1
 flake8>=3.5.0
 jupyter-sphinx
 myst-nb
-numba-stats @ git+https://github.com/HDembinski/numba-stats.git  # CMSShape not yet released (expected 1.8.0)
+numba-stats  # hack for pypi release, doesn't allow git repos @ git+https://github.com/HDembinski/numba-stats.git  # CMSShape not yet released (expected 1.8.0)
 pip>=9.0.1
 pre-commit
 pydata-sphinx-theme>=0.9  # new dark theme configuration
diff --git a/setup.cfg b/setup.cfg
index e0d4895..0959518 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,15 +19,16 @@ classifiers =
     Operating System :: Unix
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.8
     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
     Topic :: Scientific/Engineering :: Physics
 keywords = TensorFlow, model, fitting, scalable, HEP, physics
 
 [options]
-python_requires = >=3.8
+python_requires = >=3.9
 
 [bdist_wheel]
 universal = 1