diff --git a/.github/workflows/lib-build-and-push.yml b/.github/workflows/lib-build-and-push.yml
index c1fea0cd4f..f7df5361e4 100644
--- a/.github/workflows/lib-build-and-push.yml
+++ b/.github/workflows/lib-build-and-push.yml
@@ -98,8 +98,6 @@ jobs:
           echo "CIBW_TEST_COMMAND=true" >> $GITHUB_ENV;
           echo "CIBW_TEST_COMMAND_WINDOWS=(exit 0)" >> $GITHUB_ENV;
           echo "CIBW_TEST_SKIP=*" >> $GITHUB_ENV;
-          echo "CIBW_SKIP=cp2* cp36* pp36* cp37* pp37* cp38* pp38* cp39* pp39* *i686 *musllinux*" >> $GITHUB_ENV;
-          echo "CIBW_BUILD=cp3* pp3*" >> $GITHUB_ENV;
           echo "CIBW_BEFORE_TEST=true" >> $GITHUB_ENV;
           echo "CIBW_BEFORE_TEST_WINDOWS=(exit 0)" >> $GITHUB_ENV;
 
@@ -110,7 +108,7 @@ jobs:
 
       - name: Install cibuildwheel
         run: |
-          uv tool install 'cibuildwheel==2.22.0'
+          uv tool install 'cibuildwheel==3.2.1'
 
       - name: Install OpenSSL for Windows
         if: runner.os == 'Windows'
@@ -127,7 +125,7 @@ jobs:
           conan profile detect
           conan install conanfile.py
 
-      - name: Install OpenSSL for MacOS
+      - name: Install libev for MacOS
         if: runner.os == 'MacOs'
         run: |
           brew install libev
diff --git a/pyproject.toml b/pyproject.toml
index 8b83c5fb5b..6f4e4a8f6e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -129,15 +129,12 @@ tag_regex = '(?P<version>\d*?\.\d*?\.\d*?)-scylla'
 build-frontend = "build[uv]"
 environment = { CASS_DRIVER_BUILD_CONCURRENCY = "2", CASS_DRIVER_BUILD_EXTENSIONS_ARE_MUST = "yes", CFLAGS = "-g0 -O3" }
 skip = [
-    "cp2*",
-    "cp36*",
-    "pp36*",
-    "cp37*",
-    "pp37*",
     "cp38*",
     "pp38*",
     "cp39*",
     "pp39*",
+    "cp3*t-*",
+    "pp3*t-*",
     "*i686",
     "*musllinux*",
 ]
@@ -149,6 +146,7 @@ manylinux-aarch64-image = "manylinux_2_28"
 manylinux-pypy_x86_64-image = "manylinux_2_28"
 manylinux-pypy_aarch64-image = "manylinux_2_28"
 
+enable = ["pypy"]
 [tool.cibuildwheel.linux]
 
 before-build = "rm -rf ~/.pyxbld && rpm --import https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux && yum install -y libffi-devel libev libev-devel openssl openssl-devel"
@@ -171,7 +169,3 @@ test-command = [
 
 # TODO: set CASS_DRIVER_BUILD_EXTENSIONS_ARE_MUST to yes when https://github.com/scylladb/python-driver/issues/429 is fixed
 environment = { CASS_DRIVER_BUILD_CONCURRENCY = "2", CASS_DRIVER_BUILD_EXTENSIONS_ARE_MUST = "no" }
-
-[[tool.cibuildwheel.overrides]]
-select = "pp*"
-test-command = []