diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 6b973dd..ef62bb0 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -27,7 +27,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python: [ 3.7, "3.10" ]
+        python: [ 3.7, 3.11 ]
         os:  [ macos-latest, ubuntu-latest, windows-latest ]
     defaults:
       run:
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 09dc4a8..dd758b3 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python: [3.7, 3.8, 3.9, "3.10"]
+        python: [3.7, 3.8, 3.9, "3.10", 3.11]
         wordsize: [64]
     steps:
       - name: Checkout
@@ -58,7 +58,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        python: [3.7, 3.8, 3.9, "3.10"]
+        python: [3.7, 3.8, 3.9, "3.10", 3.11]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -114,7 +114,23 @@ jobs:
       - name: Build wheels in docker
         shell: bash
         run: |
-          docker run --rm -v `pwd`:/project -w /project quay.io/pypa/manylinux2010_x86_64 bash docker/buildwheel.sh
+          docker run --rm -v `pwd`:/project -w /project quay.io/pypa/manylinux2014_x86_64 bash docker/buildwheel.sh
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.11
+
+      - name: Run tests (3.11)
+        run: |
+          python -VV
+          # We install in this odd way to make sure we get both deps and a local kastore
+          pip install kastore --only-binary kastore -f python/dist/wheelhouse
+          pip uninstall -y kastore
+          pip install -v kastore --only-binary kastore -f python/dist/wheelhouse --no-index
+          python -c "import kastore"
+          pip install -r python/requirements/CI/tests/requirements.txt
+          python -m pytest -v python
 
       - name: Set up Python 3.10
         uses: actions/setup-python@v2
diff --git a/.mergify.yml b/.mergify.yml
index acb9824..4ec47ac 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -5,11 +5,11 @@ queue_rules:
       - "#changes-requested-reviews-by=0"
       - status-success=Lint
       - status-success=Python (3.7, macos-latest)
-      - status-success=Python (3.10, macos-latest)
+      - status-success=Python (3.11, macos-latest)
       - status-success=Python (3.7, ubuntu-latest)
-      - status-success=Python (3.10, ubuntu-latest)
+      - status-success=Python (3.11, ubuntu-latest)
       - status-success=Python (3.7, windows-latest)
-      - status-success=Python (3.10, windows-latest)
+      - status-success=Python (3.11, windows-latest)
       - "status-success=ci/circleci: build"
 
 pull_request_rules:
@@ -22,11 +22,11 @@ pull_request_rules:
       - label=AUTOMERGE-REQUESTED
       - status-success=Lint
       - status-success=Python (3.7, macos-latest)
-      - status-success=Python (3.10, macos-latest)
+      - status-success=Python (3.11, macos-latest)
       - status-success=Python (3.7, ubuntu-latest)
-      - status-success=Python (3.10, ubuntu-latest)
+      - status-success=Python (3.11, ubuntu-latest)
       - status-success=Python (3.7, windows-latest)
-      - status-success=Python (3.10, windows-latest)
+      - status-success=Python (3.11, windows-latest)
       - "status-success=ci/circleci: build"
     actions:
       queue:
diff --git a/docker/shared.env b/docker/shared.env
index 6f613fb..26a8ea4 100644
--- a/docker/shared.env
+++ b/docker/shared.env
@@ -1,4 +1,5 @@
 PYTHON_VERSIONS=(
+    cp311-cp311
     cp310-cp310
     cp39-cp39
     cp38-cp38
diff --git a/python/setup.cfg b/python/setup.cfg
index b2e72eb..701e6f7 100644
--- a/python/setup.cfg
+++ b/python/setup.cfg
@@ -23,6 +23,7 @@ classifiers =
         Programming Language :: Python :: 3.8
         Programming Language :: Python :: 3.9
         Programming Language :: Python :: 3.10
+        Programming Language :: Python :: 3.11
         Programming Language :: Python :: 3 :: Only
 keywords =
     binary store