diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml
index fae29873..31883ec3 100644
--- a/.github/workflows/conformance.yml
+++ b/.github/workflows/conformance.yml
@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
       matrix:
-        python-version: [3.8, 3.9]
+        python-version: ['3.8', '3.9', '3.10']
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
index fbb36585..ea147493 100644
--- a/.github/workflows/unit.yml
+++ b/.github/workflows/unit.yml
@@ -4,7 +4,7 @@ jobs:
   test:
     strategy:
       matrix:
-        python: [3.6, 3.7, 3.8, 3.9]
+        python: ['3.6', '3.7', '3.8', '3.9', '3.10']
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a52fe500..90b1501e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.3.0] - 2021-10-08
+### Added
+- Support Python 3.10
+
 ## [2.2.1] - 2021-06-01
 ### Changed
 - Update GCF Python 3.7 backwards-compatible logging ([#131])
diff --git a/setup.py b/setup.py
index 2e7109d5..763f0a15 100644
--- a/setup.py
+++ b/setup.py
@@ -42,6 +42,7 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
     ],
     keywords="functions-framework",
     packages=find_packages(where="src"),
diff --git a/tox.ini b/tox.ini
index 92483e7c..fb76a0e8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{35,36,37,38,39}-{ubuntu-latest,macos-latest,windows-latest},lint
+envlist = py{35,36,37,38,39,310}-{ubuntu-latest,macos-latest,windows-latest},lint
 
 [testenv]
 usedevelop = true