diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd1ca22..c054286 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,23 +56,20 @@ before_script:
 node-10 test: *test_custom
 
 # Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml
-ruby-2.4-golang-1.11-git-2.18 test: *test_custom
-ruby-2.5-golang-1.10-git-2.18 test: *test_custom
-ruby-2.5-golang-1.11-git-2.18 test: *test_custom
-ruby-2.6-golang-1.11-git-2.18 test: *test_custom
-ruby-2.5-golang-1.12-git-2.18 test: *test_custom
+ruby-2.5-golang-1.11-git-2.21 test: *test_custom
+ruby-2.6-golang-1.11-git-2.21 test: *test_custom
 ruby-2.5-golang-1.12-git-2.21 test: *test_custom
-ruby-2.6-golang-1.12-git-2.18 test: *test_custom
-
+ruby-2.6-golang-1.12-git-2.21 test: *test_custom
 
 # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
-ruby-2.5.3-golang-1.11-git-2.18-chrome-71.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
-ruby-2.5.3-golang-1.11-git-2.18-chrome-71.0-node-10.x-yarn-1.12-postgresql-10-graphicsmagick-1.3.29 test: *test_custom
-ruby-2.6.2-golang-1.11-git-2.18-chrome-71.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
-ruby-2.6.2-golang-1.11-git-2.18-chrome-71.0-node-10.x-yarn-1.12-postgresql-10-graphicsmagick-1.3.29 test: *test_custom
+ruby-2.5.3-golang-1.11-git-2.21-chrome-71.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
+ruby-2.5.3-golang-1.11-git-2.21-chrome-71.0-node-10.x-yarn-1.12-postgresql-10-graphicsmagick-1.3.29 test: *test_custom
+ruby-2.6.2-golang-1.11-git-2.21-chrome-71.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
+ruby-2.6.2-golang-1.11-git-2.21-chrome-71.0-node-10.x-yarn-1.12-postgresql-10-graphicsmagick-1.3.29 test: *test_custom
+
 # gitlab:assets:compile step
-ruby-2.5.3-git-2.18-chrome-71.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1 test: *test_custom
-ruby-2.6.2-git-2.18-chrome-73.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1 test: *test_custom
+ruby-2.5.3-git-2.21-chrome-71.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1 test: *test_custom
+ruby-2.6.2-git-2.21-chrome-73.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1 test: *test_custom
 
 # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml
 ruby-2.4.5-git-2.18-chrome-69.0-docker-18.06.1 test: *test_custom
@@ -106,22 +103,19 @@ gitlab-docs-lint test: *test_build
 node-10: *build_and_deploy_custom
 
 # Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml
-ruby-2.4-golang-1.11-git-2.18: *build_and_deploy_custom
-ruby-2.5-golang-1.10-git-2.18: *build_and_deploy_custom
-ruby-2.5-golang-1.11-git-2.18: *build_and_deploy_custom
-ruby-2.6-golang-1.11-git-2.18: *build_and_deploy_custom
-ruby-2.5-golang-1.12-git-2.18: *build_and_deploy_custom
 ruby-2.5-golang-1.12-git-2.21: *build_and_deploy_custom
-ruby-2.6-golang-1.12-git-2.18: *build_and_deploy_custom
+ruby-2.6-golang-1.12-git-2.21: *build_and_deploy_custom
+ruby-2.5-golang-1.12-git-2.21: *build_and_deploy_custom
+ruby-2.6-golang-1.12-git-2.21: *build_and_deploy_custom
 
 # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
-ruby-2.5.3-golang-1.11-git-2.18-chrome-71.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
-ruby-2.5.3-golang-1.11-git-2.18-chrome-71.0-node-10.x-yarn-1.12-postgresql-10-graphicsmagick-1.3.29: *build_and_deploy_custom
-ruby-2.6.2-golang-1.11-git-2.18-chrome-73.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
-ruby-2.6.2-golang-1.11-git-2.18-chrome-73.0-node-10.x-yarn-1.12-postgresql-10-graphicsmagick-1.3.29: *build_and_deploy_custom
+ruby-2.5.3-golang-1.11-git-2.21-chrome-71.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
+ruby-2.5.3-golang-1.11-git-2.21-chrome-71.0-node-10.x-yarn-1.12-postgresql-10-graphicsmagick-1.3.29: *build_and_deploy_custom
+ruby-2.6.2-golang-1.11-git-2.21-chrome-73.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
+ruby-2.6.2-golang-1.11-git-2.21-chrome-73.0-node-10.x-yarn-1.12-postgresql-10-graphicsmagick-1.3.29: *build_and_deploy_custom
 # gitlab:assets:compile step
-ruby-2.5.3-git-2.18-chrome-71.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1: *build_and_deploy_custom
-ruby-2.6.2-git-2.18-chrome-73.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1: *build_and_deploy_custom
+ruby-2.5.3-git-2.21-chrome-71.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1: *build_and_deploy_custom
+ruby-2.6.2-git-2.21-chrome-73.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1: *build_and_deploy_custom
 
 # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml
 ruby-2.4.5-git-2.18-chrome-69.0-docker-18.06.1: *build_and_deploy_custom