diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbade6e..0316e7e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,6 +61,7 @@ ruby-2.3.5-golang-1.8-git-2.13-phantomjs-2.1-node-8.x-yarn-1.0-postgresql-9.6 te
 ruby-2.4.1-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 test: *test_custom
 golang-1.8-git-2.8.4 test: *test_custom
 golang-1.8-git-2.13 test: *test_custom
+node-8.9-chrome-62.0-yarn-1.2 test: *test_custom
 
 www-gitlab-com test: *test_build
 gitlab-qa test: *test_build
@@ -89,6 +90,7 @@ ruby-2.3.5-golang-1.8-git-2.13-phantomjs-2.1-node-8.x-yarn-1.0-postgresql-9.6: *
 ruby-2.4.1-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6: *build_and_deploy_custom
 golang-1.8-git-2.8.4: *build_and_deploy_custom
 golang-1.8-git-2.13: *build_and_deploy_custom
+node-8.9-chrome-62.0-yarn-1.2: *build_and_deploy_custom
 
 www-gitlab-com: *build_and_deploy
 gitlab-qa: *build_and_deploy
diff --git a/Dockerfile.custom b/Dockerfile.custom
index 2658f0a..e4177c7 100644
--- a/Dockerfile.custom
+++ b/Dockerfile.custom
@@ -28,9 +28,9 @@ ARG PHANTOMJS_VERSION
 RUN if [ -n "$PHANTOMJS_VERSION" ] ; then /scripts/install-phantomjs $PHANTOMJS_VERSION; fi
 
 # NodeJS and Yarn
-ARG NODE_VERSION
-ARG YARN_VERSION
-RUN if [ -n "$NODE_VERSION" ] ; then /scripts/install-node $NODE_VERSION $YARN_VERSION && node --version && yarn --version; fi
+ARG NODE_INSTALL_VERSION
+ARG YARN_INSTALL_VERSION
+RUN if [ -n "$NODE_INSTALL_VERSION" ] ; then /scripts/install-node $NODE_INSTALL_VERSION $YARN_INSTALL_VERSION && node --version && yarn --version; fi
 
 # Golang
 ARG GOLANG_VERSION
diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index fe651d4..9e92b4e 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -21,7 +21,7 @@ function print_chrome_args() {
     case "$1" in
         60|60.0) CHROME_VERSION=60.0.3112.90-1 ;;
         61|61.0) CHROME_VERSION=61.0.3163.100-1 ;;
-        62|62.0) CHROME_VERSION=62.0.3202.75-1 ;;
+        62|62.0) CHROME_VERSION=62.0.3202.89-1 ;;
         *) echo "Unknown chrome version $1"; exit 1;
     esac
     printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION"
@@ -59,20 +59,20 @@ function print_phantomjs_args() {
 
 function print_node_args() {
     case "$1" in
-        7.x|7.1) NODE_VERSION=7.x ;;
-        8.x) NODE_VERSION=8.x ;;
+        7.x|7.1) NODE_INSTALL_VERSION=7.x ;;
+        8.x) NODE_INSTALL_VERSION=8.x ;;
         *) echo "Unknown node version $1"; exit 1;
     esac
-    printf -- "--build-arg NODE_VERSION=%s " "$NODE_VERSION"
+    printf -- "--build-arg NODE_INSTALL_VERSION=%s " "$NODE_INSTALL_VERSION"
 }
 
 function print_yarn_args() {
     case "$1" in
-        1.0) YARN_VERSION=1.0.2-1 ;;
-        1.2) YARN_VERSION=1.2.1-1 ;;
+        1.0) YARN_INSTALL_VERSION=1.0.2-1 ;;
+        1.2) YARN_INSTALL_VERSION=1.2.1-1 ;;
         *) echo "Unknown yarn version $1"; exit 1;
     esac
-    printf -- "--build-arg YARN_VERSION=%s " "$YARN_VERSION"
+    printf -- "--build-arg YARN_INSTALL_VERSION=%s " "$YARN_INSTALL_VERSION"
 }
 
 function print_postgres_args() {
diff --git a/scripts/install-node b/scripts/install-node
index 449eaa2..da509a3 100755
--- a/scripts/install-node
+++ b/scripts/install-node
@@ -2,13 +2,16 @@
 
 set -xeo pipefail
 
-NODE_VERSION=${1:-7.x}
-YARN_VERSION=${2:-0.27.5-1}
+NODE_INSTALL_VERSION=${1:-7.x}
+YARN_INSTALL_VERSION=${2:-0.27.5-1}
+
+# Map MAJOR.MINOR.patch -> MAJOR.x
+NODE_INSTALL_VERSION=`echo $NODE_INSTALL_VERSION | sed -r -e "s/([0-9]+)\.[0-9]+.*/\1\.x/g"`
 
 # add official debian repos for node and yarn
-curl -sS -L https://deb.nodesource.com/setup_${NODE_VERSION} | bash -
+curl -sS -L https://deb.nodesource.com/setup_${NODE_INSTALL_VERSION} | bash -
 curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
 apt-get update
-apt-get install -y nodejs yarn=$YARN_VERSION
+apt-get install -y nodejs yarn=$YARN_INSTALL_VERSION