diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 17d4635..a56f25a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -65,18 +65,18 @@ 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-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
+ruby-2.6.6-golang-1.14-git-2.28-lfs-2.9-chrome-85-node-12.18-yarn-1.22-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.18-yarn-1.22-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.18-yarn-1.22-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.18-yarn-1.22-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
-ruby-2.7.1-git-2.28-lfs-2.9-node-12.x-yarn-1.21-graphicsmagick-1.3.34 test: *test_custom
+ruby-2.6.6-git-2.28-lfs-2.9-node-12.18-yarn-1.22-graphicsmagick-1.3.34 test: *test_custom
+ruby-2.7.1-git-2.28-lfs-2.9-node-12.18-yarn-1.22-graphicsmagick-1.3.34 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.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-85-node-12.x-yarn-1.21-docker-19.03.1 test: *test_custom
+ruby-2.6.5-git-2.28-chrome-74.0-node-12.18-yarn-1.22-docker-19.03.1 test: *test_custom
+ruby-2.6.5-git-2.28-chrome-85-node-12.18-yarn-1.22-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,18 +126,18 @@ 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-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
+ruby-2.6.6-golang-1.14-git-2.28-lfs-2.9-chrome-85-node-12.18-yarn-1.22-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.18-yarn-1.22-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.18-yarn-1.22-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.18-yarn-1.22-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
-ruby-2.7.1-git-2.28-lfs-2.9-node-12.x-yarn-1.21-graphicsmagick-1.3.34: *build_and_deploy_custom
+ruby-2.6.6-git-2.28-lfs-2.9-node-12.18-yarn-1.22-graphicsmagick-1.3.34: *build_and_deploy_custom
+ruby-2.7.1-git-2.28-lfs-2.9-node-12.18-yarn-1.22-graphicsmagick-1.3.34: *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.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-85-node-12.x-yarn-1.21-docker-19.03.1: *build_and_deploy_custom
+ruby-2.6.5-git-2.28-chrome-74.0-node-12.18-yarn-1.22-docker-19.03.1: *build_and_deploy_custom
+ruby-2.6.5-git-2.28-chrome-85-node-12.18-yarn-1.22-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
diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index 6fd6ffc..c1c013b 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -139,6 +139,7 @@ function print_node_args() {
         8.x) NODE_INSTALL_VERSION=8.16.0 ;;
         10.x) NODE_INSTALL_VERSION=10.16.0 ;;
         12.x) NODE_INSTALL_VERSION=12.4.0 ;;
+        12.18) NODE_INSTALL_VERSION=12.18.4 ;;
         *) echo "Unknown node version $1"; exit 1;
     esac
     printf -- "--build-arg NODE_INSTALL_VERSION=%s " "$NODE_INSTALL_VERSION"
@@ -149,6 +150,7 @@ function print_yarn_args() {
         1.12) YARN_INSTALL_VERSION=1.12.3-1 ;;
         1.16) YARN_INSTALL_VERSION=1.16.0-1 ;;
         1.21) YARN_INSTALL_VERSION=1.21.1-1 ;;
+        1.22) YARN_INSTALL_VERSION=1.22.5-1 ;;
         *) echo "Unknown yarn version $1"; exit 1;
     esac
     printf -- "--build-arg YARN_INSTALL_VERSION=%s " "$YARN_INSTALL_VERSION"