diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
index 64a8f7f..6a371db 100644
--- a/.github/workflows/build-wheels.yml
+++ b/.github/workflows/build-wheels.yml
@@ -20,7 +20,11 @@ jobs:
         with:
           platforms: all
       - name: Build wheels
-        uses: joerick/cibuildwheel@v1.11.0
+        uses: pypa/cibuildwheel@v2.0.1
+        with:
+          output-dir: ./wheelhouse
         env:
-          CIBW_BUILD: "cp36-* cp37-* cp38-* cp39-*"
+          CIBW_BUILD: "cp36-* cp37-* cp38-* cp39-* cp310-*"
           CIBW_ARCHS_LINUX: auto aarch64
+          CIBW_PRERELEASE_PYTHONS: True
+          CIBW_BEFORE_ALL_LINUX: yum install -y libffi-devel
diff --git a/.github/workflows/release-wheels.yml b/.github/workflows/release-wheels.yml
index 793d600..1b4cc71 100644
--- a/.github/workflows/release-wheels.yml
+++ b/.github/workflows/release-wheels.yml
@@ -23,10 +23,14 @@ jobs:
         with:
           platforms: all
       - name: Build wheels
-        uses: joerick/cibuildwheel@v1.11.0
+        uses: pypa/cibuildwheel@v2.0.1
+        with:
+          output-dir: ./wheelhouse
         env:
-          CIBW_BUILD: "cp36-* cp37-* cp38-* cp39-*"
+          CIBW_BUILD: "cp36-* cp37-* cp38-* cp39-* cp310-*"
           CIBW_ARCHS_LINUX: auto aarch64
+          CIBW_PRERELEASE_PYTHONS: True
+          CIBW_BEFORE_ALL_LINUX: yum install -y libffi-devel
       - uses: actions/upload-artifact@v2
         with:
           path: ./wheelhouse/*.whl
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7c6bf8f..09d1d56 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,15 +10,17 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, windows-2019, macos-10.15]
-        python-version: [ '3.6', '3.7', '3.8', '3.9' ]
+        python-version: [ '3.6', '3.7', '3.8', '3.9', '3.10-dev']
     steps:
     - uses: actions/checkout@v2
       with:
         submodules: true
     - name: Setup Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: python -m pip install -U setuptools wheel
     - name: Build package
       run: python setup.py install
     - name: Run tests
diff --git a/setup.py b/setup.py
index 3d5eb6f..2122504 100755
--- a/setup.py
+++ b/setup.py
@@ -35,6 +35,7 @@ def get_version():
           'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: 3.8',
           'Programming Language :: Python :: 3.9',
+          'Programming Language :: Python :: 3.10',
           'Programming Language :: Python :: Implementation :: CPython',
           'Programming Language :: Python :: Implementation :: PyPy',
       ],
diff --git a/tox.ini b/tox.ini
index bc0794e..e30a07c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist  = py36, py37, py38, py39
+envlist  = py36, py37, py38, py39, py310
 
 [testenv]
 commands = python tests/tests.py