diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 7659908dd..a3679305b 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -67,7 +67,7 @@ body:
   - type: checkboxes
     attributes:
       label: Does this issue happen in VS Code or GitHub Codespaces?
-      description: Please try reproducing this issue in VS Code and GitHub Codespaces.  If the bug reproduces in either VS Code or GitHub Codespaces, please submit the issue upstream instead (https://github.com/microsoft/vscode).
+      description: Please try reproducing this issue in VS Code and GitHub Codespaces. If the bug reproduces in either VS Code or GitHub Codespaces, please submit the issue upstream instead (https://github.com/microsoft/vscode).
       options:
         - label: I tested this in native VS Code.
           required: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 267e7a2cc..cc170f66a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,18 @@ Code v99.99.999
 
 ## Unreleased
 
+## [4.20.1](https://github.com/coder/code-server/releases/tag/v4.20.1) - 2021-01-22
+
+Code v1.85.2
+
+## Changed
+
+- Updated to Code 1.85.2.
+
+## Fixed
+
+- Query variables are no longer double-encoded when going over the path proxy.
+
 ## [4.20.0](https://github.com/coder/code-server/releases/tag/v4.20.0) - 2023-12-21
 
 Code v1.85.1
diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml
index c8f3aa80a..d2c9947c3 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.16.0
+version: 3.16.1
 
 # 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.20.0
+appVersion: 4.20.1
diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml
index 3a844b460..ed253b61e 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.20.0'
+  tag: '4.20.1'
   pullPolicy: Always
 
 # Specifies one or more secrets to be used when pulling images from a