diff --git a/.azure/publish-release-nightly.yml b/.azure/publish-release-nightly.yml
index aac40fe3..53a929b6 100644
--- a/.azure/publish-release-nightly.yml
+++ b/.azure/publish-release-nightly.yml
@@ -27,8 +27,8 @@ schedules:
 
 variables:
   # ---- COMMON ----
-  CIBW_VERSION: "2.8.*"
-  PY_VERSION: "3.10"
+  CIBW_VERSION: "2.18.*"
+  PY_VERSION: "3.11"
 
 jobs:
 - job: Build_Wheels
diff --git a/.azure/publish-release.yml b/.azure/publish-release.yml
index b2074a09..207e1fed 100644
--- a/.azure/publish-release.yml
+++ b/.azure/publish-release.yml
@@ -27,8 +27,8 @@ pr: none
 
 variables:
   # ---- COMMON ----
-  CIBW_VERSION: "2.8.*"
-  PY_VERSION: "3.10"
+  CIBW_VERSION: "2.18.*"
+  PY_VERSION: "3.11"
 
 jobs:
 - job: Build_Wheels
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 022d3edc..a0c6f390 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -53,15 +53,30 @@ jobs:
       'Ubuntu 22.04 LTS with Python 3.11':
         image: ubuntu-22.04
         python-version: "3.11"
+      'Ubuntu 22.04 LTS with Python 3.12':
+        image: ubuntu-22.04
+        python-version: "3.12"
       'macOS 11 with Python 3.10':
         image: macOS-11
         python-version: "3.10"
+      'macOS 11 with Python 3.11':
+        image: macOS-11
+        python-version: "3.11"
+      'macOS 11 with Python 3.12':
+        image: macOS-11
+        python-version: "3.12"
       'Windows Server with Python 3.7':
         image: windows-latest
         python-version: "3.7"
       'Windows Server with Python 3.10':
         image: windows-latest
         python-version: "3.10"
+      'Windows Server with Python 3.11':
+        image: windows-latest
+        python-version: "3.11"
+      'Windows Server with Python 3.12':
+        image: windows-latest
+        python-version: "3.12"
       'Fuzzer on Ubuntu 22.04 LTS with Python 3.7':
         image: ubuntu-22.04
         python-version: "3.7"
@@ -78,6 +93,14 @@ jobs:
         image: ubuntu-22.04
         python-version: "3.10"
         run-fuzzing: true
+      'Fuzzer on Ubuntu 22.04 LTS with Python 3.11':
+        image: ubuntu-22.04
+        python-version: "3.11"
+        run-fuzzing: true
+      'Fuzzer on Ubuntu 22.04 LTS with Python 3.12':
+        image: ubuntu-22.04
+        python-version: "3.12"
+        run-fuzzing: true
   steps:
   - download: current
     artifact: cyclone-$(Agent.OS)-Release
diff --git a/pyproject.toml b/pyproject.toml
index ec8e78b2..a0aec306 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -50,7 +50,7 @@ before-build = [
 
 # By default there is no repair command on windows set, use delvewheel
 repair-wheel-command = [
-    "pip install delvewheel==0.0.18",
+    "pip install delvewheel==1.6.0",
     "delvewheel repair -w {dest_dir} --no-mangle-all {wheel}"
 ]
 
diff --git a/setup.py b/setup.py
index a2c8280b..ebf947e5 100644
--- a/setup.py
+++ b/setup.py
@@ -119,6 +119,8 @@
         "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",
         "Operating System :: OS Independent"
     ],
     packages=find_packages(".", include=("cyclonedds", "cyclonedds.*")),