diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1141973..6bd191c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-22.04]
         python-version: ['3.11']
         toxenv: [django42]
 
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2639099..d50d10e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -14,6 +14,15 @@ Unreleased
 
 *
 
+2.1.0 - 2025-06-22
+**********************************************
+
+Changed
+=======
+
+**Teak Support**: Upgrade requirements based on edx-platform Teak release, update GitHub Actions workflows to use the `ubuntu-22.04` runner image.
+
+
 [2.0.1] - 2025-02-05
 **********************************************
 
diff --git a/README.rst b/README.rst
index 3016ddb..14a0beb 100644
--- a/README.rst
+++ b/README.rst
@@ -17,6 +17,8 @@ Compatibility Notes
 +------------------+--------------+
 | Sumac            | >= 2.0.0     |
 +------------------+--------------+
+| Teak             | >= 2.1.0     |
++------------------+--------------+
 
 Enabling in Studio
 ------------------
diff --git a/flow_control/__init__.py b/flow_control/__init__.py
index 965b31a..19f3efd 100644
--- a/flow_control/__init__.py
+++ b/flow_control/__init__.py
@@ -2,4 +2,4 @@
 Init for main Flow-Control XBlock
 """
 from .flow import FlowCheckPointXblock
-__version__ = '2.0.1'
+__version__ = '2.1.0'
diff --git a/requirements/base.txt b/requirements/base.txt
index ec45102..161caa2 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -8,19 +8,19 @@ appdirs==1.4.4
     # via fs
 asgiref==3.8.1
     # via django
-boto3==1.36.4
+boto3==1.38.41
     # via fs-s3fs
-botocore==1.36.4
+botocore==1.38.41
     # via
     #   boto3
     #   s3transfer
-django==4.2.18
+django==4.2.23
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   openedx-django-pyfs
 dnspython==2.7.0
     # via pymongo
-edx-opaque-keys[django]==2.11.0
+edx-opaque-keys[django]==3.0.0
     # via -r requirements/base.in
 fs==2.4.16
     # via
@@ -35,9 +35,9 @@ jmespath==1.0.1
     #   botocore
 lazy==1.6
     # via xblock
-lxml==5.3.0
+lxml==5.4.0
     # via xblock
-mako==1.3.8
+mako==1.3.10
     # via
     #   xblock
     #   xblock-utils
@@ -45,23 +45,23 @@ markupsafe==3.0.2
     # via
     #   mako
     #   xblock
-openedx-django-pyfs==3.7.0
+openedx-django-pyfs==3.8.0
     # via xblock
-pbr==6.1.0
+pbr==6.1.1
     # via stevedore
-pymongo==4.10.1
+pymongo==4.13.2
     # via edx-opaque-keys
 python-dateutil==2.9.0.post0
     # via
     #   botocore
     #   xblock
-pytz==2024.2
+pytz==2025.2
     # via xblock
 pyyaml==6.0.2
     # via xblock
-s3transfer==0.11.1
+s3transfer==0.13.0
     # via boto3
-simplejson==3.19.3
+simplejson==3.20.1
     # via
     #   xblock
     #   xblock-utils
@@ -72,21 +72,21 @@ six==1.17.0
     #   python-dateutil
 sqlparse==0.5.3
     # via django
-stevedore==5.4.0
+stevedore==5.4.1
     # via edx-opaque-keys
-typing-extensions==4.12.2
+typing-extensions==4.14.0
     # via edx-opaque-keys
 urllib3==2.2.3
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   botocore
-web-fragments==2.2.0
+web-fragments==3.1.0
     # via
     #   xblock
     #   xblock-utils
 webob==1.8.9
     # via xblock
-xblock[django]==5.1.1
+xblock[django]==5.2.0
     # via
     #   -r requirements/base.in
     #   xblock-utils
diff --git a/requirements/ci.txt b/requirements/ci.txt
index 1eeb651..48e6dcd 100644
--- a/requirements/ci.txt
+++ b/requirements/ci.txt
@@ -6,19 +6,19 @@
 #
 backports-tarfile==1.2.0
     # via jaraco-context
-certifi==2024.12.14
+certifi==2025.6.15
     # via requests
 cffi==1.17.1
     # via cryptography
-charset-normalizer==3.4.1
+charset-normalizer==3.4.2
     # via requests
-cryptography==44.0.0
+cryptography==45.0.4
     # via secretstorage
 distlib==0.3.9
     # via virtualenv
 docutils==0.21.2
     # via readme-renderer
-filelock==3.17.0
+filelock==3.18.0
     # via
     #   tox
     #   virtualenv
@@ -26,7 +26,7 @@ id==1.5.0
     # via twine
 idna==3.10
     # via requests
-importlib-metadata==8.6.1
+importlib-metadata==8.7.0
     # via keyring
 jaraco-classes==3.4.0
     # via keyring
@@ -34,7 +34,7 @@ jaraco-context==6.0.1
     # via keyring
 jaraco-functools==4.1.0
     # via keyring
-jeepney==0.8.0
+jeepney==0.9.0
     # via
     #   keyring
     #   secretstorage
@@ -44,22 +44,22 @@ markdown-it-py==3.0.0
     # via rich
 mdurl==0.1.2
     # via markdown-it-py
-more-itertools==10.6.0
+more-itertools==10.7.0
     # via
     #   jaraco-classes
     #   jaraco-functools
-nh3==0.2.20
+nh3==0.2.21
     # via readme-renderer
-packaging==24.2
+packaging==25.0
     # via
     #   pyproject-api
     #   tox
     #   twine
-platformdirs==4.3.6
+platformdirs==4.3.8
     # via
     #   tox
     #   virtualenv
-pluggy==1.5.0
+pluggy==1.6.0
     # via tox
 py==1.11.0
     # via tox
@@ -71,7 +71,7 @@ pygments==2.19.1
     #   rich
 readme-renderer==44.0
     # via twine
-requests==2.32.3
+requests==2.32.4
     # via
     #   id
     #   requests-toolbelt
@@ -80,7 +80,7 @@ requests-toolbelt==1.0.0
     # via twine
 rfc3986==2.0.0
     # via twine
-rich==13.9.4
+rich==14.0.0
     # via twine
 secretstorage==3.3.3
     # via keyring
@@ -99,7 +99,7 @@ urllib3==2.2.3
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   requests
     #   twine
-virtualenv==20.29.1
+virtualenv==20.31.2
     # via tox
-zipp==3.21.0
+zipp==3.23.0
     # via importlib-metadata
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 62016f7..34ec49c 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -6,7 +6,7 @@
 #
 asgiref==3.8.1
     # via django
-astroid==3.3.8
+astroid==3.3.10
     # via
     #   -r requirements/quality.txt
     #   pylint
@@ -18,7 +18,7 @@ build==1.2.2.post1
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
-certifi==2024.12.14
+certifi==2025.6.15
     # via
     #   -r requirements/ci.txt
     #   requests
@@ -28,23 +28,23 @@ cffi==1.17.1
     #   cryptography
 chardet==5.2.0
     # via diff-cover
-charset-normalizer==3.4.1
+charset-normalizer==3.4.2
     # via
     #   -r requirements/ci.txt
     #   requests
-click==8.1.8
+click==8.2.1
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
-coverage==7.6.10
+coverage==7.9.1
     # via -r requirements/quality.txt
-cryptography==44.0.0
+cryptography==45.0.4
     # via
     #   -r requirements/ci.txt
     #   secretstorage
-diff-cover==9.2.1
+diff-cover==9.3.2
     # via -r requirements/dev.in
-dill==0.3.9
+dill==0.4.0
     # via
     #   -r requirements/quality.txt
     #   pylint
@@ -52,7 +52,7 @@ distlib==0.3.9
     # via
     #   -r requirements/ci.txt
     #   virtualenv
-django==4.2.18
+django==4.2.23
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   edx-i18n-tools
@@ -60,9 +60,9 @@ docutils==0.21.2
     # via
     #   -r requirements/ci.txt
     #   readme-renderer
-edx-i18n-tools==1.6.3
+edx-i18n-tools==1.9.0
     # via -r requirements/dev.in
-filelock==3.17.0
+filelock==3.18.0
     # via
     #   -r requirements/ci.txt
     #   tox
@@ -75,11 +75,11 @@ idna==3.10
     # via
     #   -r requirements/ci.txt
     #   requests
-importlib-metadata==8.6.1
+importlib-metadata==8.7.0
     # via
     #   -r requirements/ci.txt
     #   keyring
-isort==5.13.2
+isort==6.0.1
     # via
     #   -r requirements/quality.txt
     #   pylint
@@ -95,22 +95,22 @@ jaraco-functools==4.1.0
     # via
     #   -r requirements/ci.txt
     #   keyring
-jeepney==0.8.0
+jeepney==0.9.0
     # via
     #   -r requirements/ci.txt
     #   keyring
     #   secretstorage
-jinja2==3.1.5
+jinja2==3.1.6
     # via diff-cover
 keyring==25.6.0
     # via
     #   -r requirements/ci.txt
     #   twine
-lxml[html-clean,html_clean]==5.3.0
+lxml[html-clean,html_clean]==5.4.0
     # via
     #   edx-i18n-tools
     #   lxml-html-clean
-lxml-html-clean==0.4.1
+lxml-html-clean==0.4.2
     # via lxml
 markdown-it-py==3.0.0
     # via
@@ -126,16 +126,16 @@ mdurl==0.1.2
     # via
     #   -r requirements/ci.txt
     #   markdown-it-py
-more-itertools==10.6.0
+more-itertools==10.7.0
     # via
     #   -r requirements/ci.txt
     #   jaraco-classes
     #   jaraco-functools
-nh3==0.2.20
+nh3==0.2.21
     # via
     #   -r requirements/ci.txt
     #   readme-renderer
-packaging==24.2
+packaging==25.0
     # via
     #   -r requirements/ci.txt
     #   -r requirements/pip-tools.txt
@@ -148,13 +148,13 @@ pep8==1.7.1
     # via -r requirements/quality.txt
 pip-tools==7.4.1
     # via -r requirements/pip-tools.txt
-platformdirs==4.3.6
+platformdirs==4.3.8
     # via
     #   -r requirements/ci.txt
     #   -r requirements/quality.txt
     #   pylint
     #   virtualenv
-pluggy==1.5.0
+pluggy==1.6.0
     # via
     #   -r requirements/ci.txt
     #   diff-cover
@@ -175,7 +175,7 @@ pygments==2.19.1
     #   diff-cover
     #   readme-renderer
     #   rich
-pylint==3.3.3
+pylint==3.3.7
     # via -r requirements/quality.txt
 pyproject-hooks==1.2.0
     # via
@@ -188,7 +188,7 @@ readme-renderer==44.0
     # via
     #   -r requirements/ci.txt
     #   twine
-requests==2.32.3
+requests==2.32.4
     # via
     #   -r requirements/ci.txt
     #   id
@@ -202,7 +202,7 @@ rfc3986==2.0.0
     # via
     #   -r requirements/ci.txt
     #   twine
-rich==13.9.4
+rich==14.0.0
     # via
     #   -r requirements/ci.txt
     #   twine
@@ -216,7 +216,7 @@ six==1.17.0
     #   tox
 sqlparse==0.5.3
     # via django
-tomlkit==0.13.2
+tomlkit==0.13.3
     # via
     #   -r requirements/quality.txt
     #   pylint
@@ -234,7 +234,7 @@ urllib3==2.2.3
     #   -r requirements/ci.txt
     #   requests
     #   twine
-virtualenv==20.29.1
+virtualenv==20.31.2
     # via
     #   -r requirements/ci.txt
     #   tox
@@ -242,7 +242,7 @@ wheel==0.45.1
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
-zipp==3.21.0
+zipp==3.23.0
     # via
     #   -r requirements/ci.txt
     #   importlib-metadata
diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
index 5461e43..990b423 100644
--- a/requirements/pip-tools.txt
+++ b/requirements/pip-tools.txt
@@ -6,9 +6,9 @@
 #
 build==1.2.2.post1
     # via pip-tools
-click==8.1.8
+click==8.2.1
     # via pip-tools
-packaging==24.2
+packaging==25.0
     # via build
 pip-tools==7.4.1
     # via -r requirements/pip-tools.in
diff --git a/requirements/pip.txt b/requirements/pip.txt
index e6c3348..e109db2 100644
--- a/requirements/pip.txt
+++ b/requirements/pip.txt
@@ -12,5 +12,5 @@ pip==24.2
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/pip.in
-setuptools==75.8.0
+setuptools==80.9.0
     # via -r requirements/pip.in
diff --git a/requirements/quality.txt b/requirements/quality.txt
index c5b79b0..1ed4c76 100644
--- a/requirements/quality.txt
+++ b/requirements/quality.txt
@@ -4,21 +4,21 @@
 #
 #    make upgrade
 #
-astroid==3.3.8
+astroid==3.3.10
     # via pylint
-coverage==7.6.10
+coverage==7.9.1
     # via -r requirements/quality.in
-dill==0.3.9
+dill==0.4.0
     # via pylint
-isort==5.13.2
+isort==6.0.1
     # via pylint
 mccabe==0.7.0
     # via pylint
 pep8==1.7.1
     # via -r requirements/quality.in
-platformdirs==4.3.6
+platformdirs==4.3.8
     # via pylint
-pylint==3.3.3
+pylint==3.3.7
     # via -r requirements/quality.in
-tomlkit==0.13.2
+tomlkit==0.13.3
     # via pylint
diff --git a/requirements/test.txt b/requirements/test.txt
index caba2ca..1067f4d 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -8,21 +8,21 @@ appdirs==1.4.4
     # via fs
 asgiref==3.8.1
     # via django
-boto3==1.36.4
+boto3==1.38.41
     # via fs-s3fs
-botocore==1.36.4
+botocore==1.38.41
     # via
     #   boto3
     #   s3transfer
 ddt==1.7.2
     # via -r requirements/test.in
-django==4.2.18
+django==4.2.23
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   openedx-django-pyfs
 dnspython==2.7.0
     # via pymongo
-edx-opaque-keys[django]==2.11.0
+edx-opaque-keys[django]==3.0.0
     # via -r requirements/base.in
 fs==2.4.16
     # via
@@ -31,7 +31,7 @@ fs==2.4.16
     #   xblock
 fs-s3fs==1.1.1
     # via openedx-django-pyfs
-iniconfig==2.0.0
+iniconfig==2.1.0
     # via pytest
 jmespath==1.0.1
     # via
@@ -39,9 +39,9 @@ jmespath==1.0.1
     #   botocore
 lazy==1.6
     # via xblock
-lxml==5.3.0
+lxml==5.4.0
     # via xblock
-mako==1.3.8
+mako==1.3.10
     # via
     #   xblock
     #   xblock-utils
@@ -49,31 +49,33 @@ markupsafe==3.0.2
     # via
     #   mako
     #   xblock
-mock==5.1.0
+mock==5.2.0
     # via -r requirements/test.in
-openedx-django-pyfs==3.7.0
+openedx-django-pyfs==3.8.0
     # via xblock
-packaging==24.2
+packaging==25.0
     # via pytest
-pbr==6.1.0
+pbr==6.1.1
     # via stevedore
-pluggy==1.5.0
+pluggy==1.6.0
     # via pytest
-pymongo==4.10.1
+pygments==2.19.1
+    # via pytest
+pymongo==4.13.2
     # via edx-opaque-keys
-pytest==8.3.4
+pytest==8.4.1
     # via -r requirements/test.in
 python-dateutil==2.9.0.post0
     # via
     #   botocore
     #   xblock
-pytz==2024.2
+pytz==2025.2
     # via xblock
 pyyaml==6.0.2
     # via xblock
-s3transfer==0.11.1
+s3transfer==0.13.0
     # via boto3
-simplejson==3.19.3
+simplejson==3.20.1
     # via
     #   xblock
     #   xblock-utils
@@ -84,21 +86,21 @@ six==1.17.0
     #   python-dateutil
 sqlparse==0.5.3
     # via django
-stevedore==5.4.0
+stevedore==5.4.1
     # via edx-opaque-keys
-typing-extensions==4.12.2
+typing-extensions==4.14.0
     # via edx-opaque-keys
 urllib3==2.2.3
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   botocore
-web-fragments==2.2.0
+web-fragments==3.1.0
     # via
     #   xblock
     #   xblock-utils
 webob==1.8.9
     # via xblock
-xblock[django]==5.1.1
+xblock[django]==5.2.0
     # via
     #   -r requirements/base.in
     #   xblock-utils
diff --git a/requirements/tox.txt b/requirements/tox.txt
index aebf440..6f56498 100644
--- a/requirements/tox.txt
+++ b/requirements/tox.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-cachetools==5.5.1
+cachetools==6.1.0
     # via tox
 chardet==5.2.0
     # via tox
@@ -12,23 +12,23 @@ colorama==0.4.6
     # via tox
 distlib==0.3.9
     # via virtualenv
-filelock==3.17.0
+filelock==3.18.0
     # via
     #   tox
     #   virtualenv
-packaging==24.2
+packaging==25.0
     # via
     #   pyproject-api
     #   tox
-platformdirs==4.3.6
+platformdirs==4.3.8
     # via
     #   tox
     #   virtualenv
-pluggy==1.5.0
+pluggy==1.6.0
     # via tox
-pyproject-api==1.9.0
+pyproject-api==1.9.1
     # via tox
-tox==4.24.1
+tox==4.27.0
     # via -r requirements/tox.in
-virtualenv==20.29.1
+virtualenv==20.31.2
     # via tox