diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 16cae83..17d4635 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -65,10 +65,10 @@ ruby-2.6-golang-1.14-git-2.28 test: *test_custom
 ruby-2.6-golang-1.14-git-2.28-pgbouncer-1.14 test: *test_custom
 
 # Used by GitLab: https://gitlab.com/gitlab-org/gitlab/blob/master/.gitlab-ci.yml
-ruby-2.6.6-golang-1.14-git-2.28-lfs-2.9-chrome-84-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34 test: *test_custom
-ruby-2.6.6-golang-1.14-git-2.28-lfs-2.9-chrome-84-node-12.x-yarn-1.21-postgresql-12-graphicsmagick-1.3.34 test: *test_custom
-ruby-2.7.1-golang-1.14-git-2.28-lfs-2.9-chrome-84-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34 test: *test_custom
-ruby-2.7.1-golang-1.14-git-2.28-lfs-2.9-chrome-84-node-12.x-yarn-1.21-postgresql-12-graphicsmagick-1.3.34 test: *test_custom
+ruby-2.6.6-golang-1.14-git-2.28-lfs-2.9-chrome-85-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34 test: *test_custom
+ruby-2.6.6-golang-1.14-git-2.28-lfs-2.9-chrome-85-node-12.x-yarn-1.21-postgresql-12-graphicsmagick-1.3.34 test: *test_custom
+ruby-2.7.1-golang-1.14-git-2.28-lfs-2.9-chrome-85-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34 test: *test_custom
+ruby-2.7.1-golang-1.14-git-2.28-lfs-2.9-chrome-85-node-12.x-yarn-1.21-postgresql-12-graphicsmagick-1.3.34 test: *test_custom
 
 # Used by GitLab's compile-production-assets and compile-test-assets jobs
 ruby-2.6.6-git-2.28-lfs-2.9-node-12.x-yarn-1.21-graphicsmagick-1.3.34 test: *test_custom
@@ -76,7 +76,7 @@ ruby-2.7.1-git-2.28-lfs-2.9-node-12.x-yarn-1.21-graphicsmagick-1.3.34 test: *tes
 
 # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml
 ruby-2.6.5-git-2.28-chrome-74.0-node-12.x-yarn-1.21-docker-19.03.1 test: *test_custom
-ruby-2.6.5-git-2.28-chrome-84-node-12.x-yarn-1.21-docker-19.03.1 test: *test_custom
+ruby-2.6.5-git-2.28-chrome-85-node-12.x-yarn-1.21-docker-19.03.1 test: *test_custom
 
 # Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/
 ruby-2.3-ansible-2.5.1-terraform-0.11 test: *test_custom
@@ -126,10 +126,10 @@ ruby-2.6-golang-1.14-git-2.28: *build_and_deploy_custom
 ruby-2.6-golang-1.14-git-2.28-pgbouncer-1.14: *build_and_deploy_custom
 
 # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
-ruby-2.6.6-golang-1.14-git-2.28-lfs-2.9-chrome-84-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34: *build_and_deploy_custom
-ruby-2.6.6-golang-1.14-git-2.28-lfs-2.9-chrome-84-node-12.x-yarn-1.21-postgresql-12-graphicsmagick-1.3.34: *build_and_deploy_custom
-ruby-2.7.1-golang-1.14-git-2.28-lfs-2.9-chrome-84-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34: *build_and_deploy_custom
-ruby-2.7.1-golang-1.14-git-2.28-lfs-2.9-chrome-84-node-12.x-yarn-1.21-postgresql-12-graphicsmagick-1.3.34: *build_and_deploy_custom
+ruby-2.6.6-golang-1.14-git-2.28-lfs-2.9-chrome-85-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34: *build_and_deploy_custom
+ruby-2.6.6-golang-1.14-git-2.28-lfs-2.9-chrome-85-node-12.x-yarn-1.21-postgresql-12-graphicsmagick-1.3.34: *build_and_deploy_custom
+ruby-2.7.1-golang-1.14-git-2.28-lfs-2.9-chrome-85-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34: *build_and_deploy_custom
+ruby-2.7.1-golang-1.14-git-2.28-lfs-2.9-chrome-85-node-12.x-yarn-1.21-postgresql-12-graphicsmagick-1.3.34: *build_and_deploy_custom
 
 # Used by GitLab's compile-production-assets and compile-test-assets jobs
 ruby-2.6.6-git-2.28-lfs-2.9-node-12.x-yarn-1.21-graphicsmagick-1.3.34: *build_and_deploy_custom
@@ -137,7 +137,7 @@ ruby-2.7.1-git-2.28-lfs-2.9-node-12.x-yarn-1.21-graphicsmagick-1.3.34: *build_an
 
 # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml
 ruby-2.6.5-git-2.28-chrome-74.0-node-12.x-yarn-1.21-docker-19.03.1: *build_and_deploy_custom
-ruby-2.6.5-git-2.28-chrome-84-node-12.x-yarn-1.21-docker-19.03.1: *build_and_deploy_custom
+ruby-2.6.5-git-2.28-chrome-85-node-12.x-yarn-1.21-docker-19.03.1: *build_and_deploy_custom
 
 # Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/
 ruby-2.3-ansible-2.5.1-terraform-0.11: *build_and_deploy_custom
@@ -207,5 +207,10 @@ cache-google-chrome:
 # ruby-2.6.6-golang-1.14-git-2.26-lfs-2.9-chrome-81.0-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34: *build_and_deploy_custom
 # ruby-2.6.6-golang-1.14-git-2.27-lfs-2.9-chrome-83-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34: *build_and_deploy_custom
 # ruby-2.6.6-golang-1.14-git-2.27-lfs-2.9-chrome-83-node-12.x-yarn-1.21-postgresql-12-graphicsmagick-1.3.34: *build_and_deploy_custom
+# ruby-2.6.6-golang-1.14-git-2.28-lfs-2.9-chrome-84-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34: *build_and_deploy_custom
+# ruby-2.6.6-golang-1.14-git-2.28-lfs-2.9-chrome-84-node-12.x-yarn-1.21-postgresql-12-graphicsmagick-1.3.34: *build_and_deploy_custom
+# ruby-2.7.1-golang-1.14-git-2.28-lfs-2.9-chrome-84-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34: *build_and_deploy_custom
+# ruby-2.7.1-golang-1.14-git-2.28-lfs-2.9-chrome-84-node-12.x-yarn-1.21-postgresql-12-graphicsmagick-1.3.34: *build_and_deploy_custom
 
 # ruby-2.6.5-git-2.27-chrome-83-node-12.x-yarn-1.21-docker-19.03.1: *build_and_deploy_custom
+# ruby-2.6.5-git-2.28-chrome-84-node-12.x-yarn-1.21-docker-19.03.1: *build_and_deploy_custom
diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index 050cf51..6fd6ffc 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -27,8 +27,8 @@ function print_golang_args() {
 }
 
 # If you add a new minor version here, be sure to check that the
-# ChromeDriver supports this: https://sites.google.com/a/chromium.org/chromedriver/downloads.
 # Chrome versions can be found at https://www.ubuntuupdates.org/pm/google-chrome-stable.
+# ChromeDriver supports this: https://sites.google.com/a/chromium.org/chromedriver/downloads.
 # You may need to bump the version in scripts/install-chrome.
 function print_chrome_args() {
     case "$1" in
@@ -60,6 +60,10 @@ function print_chrome_args() {
             CHROME_VERSION=84.0.4147.89-1
             CHROME_DRIVER_VERSION=84.0.4147.30
             ;;
+        85|85.0)
+            CHROME_VERSION=85.0.4183.83-1
+            CHROME_DRIVER_VERSION=85.0.4183.87
+            ;;
         *) echo "Unknown chrome version $1"; exit 1;
     esac
     printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION"