diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d9de6b..70cd22f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,7 +59,9 @@ ruby-2.5-golang-1.11-git-2.18 test: *test_custom
 
 # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
 ruby-2.4.5-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
+ruby-2.4.5-golang-1.9-git-2.18-chrome-69.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
 ruby-2.5.3-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
+ruby-2.5.3-golang-1.9-git-2.18-chrome-69.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
 
 # Not used anymore (?)
 golang-1.9-git-2.9.0 test: *test_custom
@@ -105,7 +107,9 @@ ruby-2.5-golang-1.11-git-2.18: *build_and_deploy_custom
 
 # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
 ruby-2.4.5-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
+ruby-2.4.5-golang-1.9-git-2.18-chrome-69.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
 ruby-2.5.3-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
+ruby-2.5.3-golang-1.9-git-2.18-chrome-69.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
 
 # Used by https://gitlab.com/gitlab-org/trello-power-up/blob/master/.gitlab-ci.yml (?)
 node-8.9-chrome-63.0-yarn-1.2: *build_and_deploy_custom
diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index e987acf..9c60622 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -126,6 +126,7 @@ function print_node_args() {
     case "$1" in
         7.x|7.1) NODE_INSTALL_VERSION=7.x ;;
         8.x) NODE_INSTALL_VERSION=8.x ;;
+        10.x) NODE_INSTALL_VERSION=10.x ;;
         *) echo "Unknown node version $1"; exit 1;
     esac
     printf -- "--build-arg NODE_INSTALL_VERSION=%s " "$NODE_INSTALL_VERSION"
@@ -135,6 +136,7 @@ function print_yarn_args() {
     case "$1" in
         1.0) YARN_INSTALL_VERSION=1.0.2-1 ;;
         1.2) YARN_INSTALL_VERSION=1.2.1-1 ;;
+        1.12) YARN_INSTALL_VERSION=1.12.3-1 ;;
         *) echo "Unknown yarn version $1"; exit 1;
     esac
     printf -- "--build-arg YARN_INSTALL_VERSION=%s " "$YARN_INSTALL_VERSION"