diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bfb2daf2..d58496da7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,8 @@ Code v99.99.999
 
 ## Unreleased
 
+## [4.121.0](https://github.com/coder/code-server/releases/tag/v4.121.0) - 2026-05-20
+
 Code v1.121.0
 
 ### Changed
diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml
index 0d045ffc2..f9c3b1103 100644
--- a/ci/helm-chart/Chart.yaml
+++ b/ci/helm-chart/Chart.yaml
@@ -15,9 +15,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.35.0
+version: 3.36.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 4.116.0
+appVersion: 4.121.0
diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml
index e4f62ba0f..0b5a3311d 100644
--- a/ci/helm-chart/values.yaml
+++ b/ci/helm-chart/values.yaml
@@ -6,7 +6,7 @@ replicaCount: 1
 
 image:
   repository: codercom/code-server
-  tag: '4.116.0'
+  tag: '4.121.0'
   pullPolicy: Always
 
 # Specifies one or more secrets to be used when pulling images from a