diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0dcc9b054..529854b43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,14 @@ Code v99.99.999
 
 ## Unreleased
 
+## [4.22.0](https://github.com/coder/code-server/releases/tag/v4.22.0) - 2021-03-03
+
+Code v1.87.0
+
+## Changed
+
+- Updated to Code 1.87.0.
+
 ## [4.21.2](https://github.com/coder/code-server/releases/tag/v4.21.2) - 2021-02-28
 
 Code v1.86.2
diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml
index 12237ae95..e524e00db 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.17.2
+version: 3.18.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.21.2
+appVersion: 4.22.0
diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml
index 9b5460534..5bdef0e29 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.21.2'
+  tag: '4.22.0'
   pullPolicy: Always
 
 # Specifies one or more secrets to be used when pulling images from a