diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ba00a0..f5d85c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,6 +61,7 @@ ruby-2.4.1-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 test: *test_
 golang-1.8-git-2.8.4 test: *test_custom
 golang-1.8-git-2.13 test: *test_custom
 
+ruby-2.3.3-golang-1.8-git-2.13-chrome-59.0-node-7.1-postgresql-9.6 test: *test_build
 www-gitlab-com test: *test_build
 doc-gitlab-com test: *test_build
 gitlab-qa test: *test_build
@@ -89,6 +90,7 @@ ruby-2.4.1-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6: *build_and_
 golang-1.8-git-2.8.4: *build_and_deploy_custom
 golang-1.8-git-2.13: *build_and_deploy_custom
 
+ruby-2.3.3-golang-1.8-git-2.13-chrome-59.0-node-7.1-postgresql-9.6: *build_and_deploy
 www-gitlab-com: *build_and_deploy
 doc-gitlab-com: *build_and_deploy
 gitlab-qa: *build_and_deploy
diff --git a/Dockerfile.custom b/Dockerfile.custom
index a7f9808..d848022 100644
--- a/Dockerfile.custom
+++ b/Dockerfile.custom
@@ -21,7 +21,7 @@ RUN if [ -n "$GIT_VERSION" ]; then /scripts/install-git && git --version; fi
 
 # Chrome
 ARG CHROME_VERSION
-RUN if [ -n "$CHROME_VERSION" ]; then /scripts/install-chrome $CHROME_VERSION; fi
+RUN if [ -n "$CHROME_VERSION" ]; then /scripts/install-chrome $CHROME_VERSION && google-chrome --version; fi
 
 # PhantomJS
 ARG PHANTOMJS_VERSION
diff --git a/Dockerfile.ruby-2.3.3-golang-1.8-git-2.13-chrome-59.0-node-7.1-postgresql-9.6 b/Dockerfile.ruby-2.3.3-golang-1.8-git-2.13-chrome-59.0-node-7.1-postgresql-9.6
new file mode 100644
index 0000000..1a8c736
--- /dev/null
+++ b/Dockerfile.ruby-2.3.3-golang-1.8-git-2.13-chrome-59.0-node-7.1-postgresql-9.6
@@ -0,0 +1,23 @@
+#
+# This build needs to be based on an older build as it's not possible to install Chrome 59.0 from
+# Google's linux repositories any longer
+#
+
+FROM registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3.3-golang-1.8-git-2.7-chrome-59.0-node-7.1-postgresql-9.6
+
+ADD / /
+
+RUN /scripts/install-essentials
+
+ENV PATH $PATH:/usr/local/go/bin
+
+# Git
+ARG GIT_VERSION=2.13.0
+ARG GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git/git-${GIT_VERSION}.tar.gz
+ARG GIT_DOWNLOAD_SHA256=9f2fa8040ebafc0c2caae4a9e2cb385c6f16c0525bcb0fbd84938bc796372e80
+RUN /scripts/install-git && git --version
+
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8