diff --git a/build_local.sh b/build_local.sh
new file mode 100755
index 0000000..b45a71a
--- /dev/null
+++ b/build_local.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+mapfile -t DOCKERFILES < <(ls -1 php/*-apache/Dockerfile)
+
+for DOCKERFILE in "${DOCKERFILES[@]}"
+do
+  DOCKERTAG=$(echo ${DOCKERFILE} | awk 'BEGIN {FS="/";} {print $1"-"$2}')
+  docker build -t drupalci/${DOCKERTAG} ./${DOCKERFILE%/Dockerfile}
+done
+
+mapfile -t DOCKERFILES < <(ls -1 db/*/Dockerfile)
+
+for DOCKERFILE in "${DOCKERFILES[@]}"
+do
+  DOCKERTAG=$(echo ${DOCKERFILE} | awk 'BEGIN {FS="/";} {print $1"-"$2}')
+  docker build -t drupalci/${DOCKERTAG} ./${DOCKERFILE%/Dockerfile}
+done
+
diff --git a/php/5.5.38-apache/Dockerfile b/php/5.5.38-apache/Dockerfile
index f022aba..2591b22 100644
--- a/php/5.5.38-apache/Dockerfile
+++ b/php/5.5.38-apache/Dockerfile
@@ -228,6 +228,16 @@ RUN curl -SL "https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-li
 
 COPY ./conf/supervisor-phantomjs.conf /etc/supervisor/conf.d/phantomjs.conf
 
+##
+# Headless Chrome
+##
+RUN curl -s https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
+    sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' && \
+    apt-get update && \
+    apt-get install google-chrome-stable xvfb -y
+
+COPY ./conf/supervisor-chrome.conf /etc/supervisor/conf.d/chrome.conf
+
 ENTRYPOINT ["docker-php-entrypoint"]
 
 COPY apache2-foreground /usr/local/bin/
diff --git a/php/5.5.38-apache/conf/supervisor-chrome.conf b/php/5.5.38-apache/conf/supervisor-chrome.conf
new file mode 100644
index 0000000..e8f2422
--- /dev/null
+++ b/php/5.5.38-apache/conf/supervisor-chrome.conf
@@ -0,0 +1,11 @@
+[program:chrome]
+# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
+# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
+command=DBUS_SESSION_BUS_ADDRESS=/dev/null DISPLAY=:99.0 sh -e /etc/init.d/xvfb start
+directory=/var/www/html
+autostart=false
+autorestart=true
+startretries=5
+stderr_logfile=/var/log/supervisor/xvfb.err.log
+stdout_logfile=/var/log/supervisor/xvfb.out.log
+user=www-data
diff --git a/php/5.5.9-apache/Dockerfile b/php/5.5.9-apache/Dockerfile
index 761bc9d..361c8fd 100644
--- a/php/5.5.9-apache/Dockerfile
+++ b/php/5.5.9-apache/Dockerfile
@@ -100,6 +100,16 @@ RUN curl -SL "https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-li
 COPY ./conf/supervisor-phantomjs.conf /etc/supervisor/conf.d/phantomjs.conf
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+##
+# Headless Chrome
+##
+RUN curl -s https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
+    sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' && \
+    apt-get update && \
+    apt-get install google-chrome-stable xvfb -y
+
+COPY ./conf/supervisor-chrome.conf /etc/supervisor/conf.d/chrome.conf
+
 ENTRYPOINT ["docker-php-entrypoint"]
 
 COPY apache2-foreground /usr/local/bin/
diff --git a/php/5.5.9-apache/conf/supervisor-chrome.conf b/php/5.5.9-apache/conf/supervisor-chrome.conf
new file mode 100644
index 0000000..e8f2422
--- /dev/null
+++ b/php/5.5.9-apache/conf/supervisor-chrome.conf
@@ -0,0 +1,11 @@
+[program:chrome]
+# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
+# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
+command=DBUS_SESSION_BUS_ADDRESS=/dev/null DISPLAY=:99.0 sh -e /etc/init.d/xvfb start
+directory=/var/www/html
+autostart=false
+autorestart=true
+startretries=5
+stderr_logfile=/var/log/supervisor/xvfb.err.log
+stdout_logfile=/var/log/supervisor/xvfb.out.log
+user=www-data
diff --git a/php/5.6-apache/Dockerfile b/php/5.6-apache/Dockerfile
index 774443f..1836293 100644
--- a/php/5.6-apache/Dockerfile
+++ b/php/5.6-apache/Dockerfile
@@ -226,6 +226,16 @@ RUN curl -SL "https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-li
 
 COPY ./conf/supervisor-phantomjs.conf /etc/supervisor/conf.d/phantomjs.conf
 
+##
+# Headless Chrome
+##
+RUN curl -s https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
+    sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' && \
+    apt-get update && \
+    apt-get install google-chrome-stable xvfb -y
+    
+COPY ./conf/supervisor-chrome.conf /etc/supervisor/conf.d/chrome.conf
+
 ENTRYPOINT ["docker-php-entrypoint"]
 
 COPY apache2-foreground /usr/local/bin/
diff --git a/php/5.6-apache/conf/supervisor-chrome.conf b/php/5.6-apache/conf/supervisor-chrome.conf
new file mode 100644
index 0000000..e8f2422
--- /dev/null
+++ b/php/5.6-apache/conf/supervisor-chrome.conf
@@ -0,0 +1,11 @@
+[program:chrome]
+# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
+# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
+command=DBUS_SESSION_BUS_ADDRESS=/dev/null DISPLAY=:99.0 sh -e /etc/init.d/xvfb start
+directory=/var/www/html
+autostart=false
+autorestart=true
+startretries=5
+stderr_logfile=/var/log/supervisor/xvfb.err.log
+stdout_logfile=/var/log/supervisor/xvfb.out.log
+user=www-data
diff --git a/php/5.6.x-apache/Dockerfile b/php/5.6.x-apache/Dockerfile
index df008f3..755d867 100644
--- a/php/5.6.x-apache/Dockerfile
+++ b/php/5.6.x-apache/Dockerfile
@@ -212,6 +212,16 @@ RUN curl -SL "https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-li
 
 COPY ./conf/supervisor-phantomjs.conf /etc/supervisor/conf.d/phantomjs.conf
 
+##
+# Headless Chrome
+##
+RUN curl -s https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
+    sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' && \
+    apt-get update && \
+    apt-get install google-chrome-stable xvfb -y
+
+COPY ./conf/supervisor-chrome.conf /etc/supervisor/conf.d/chrome.conf
+
 ENTRYPOINT ["docker-php-entrypoint"]
 
 COPY apache2-foreground /usr/local/bin/
diff --git a/php/5.6.x-apache/conf/supervisor-chrome.conf b/php/5.6.x-apache/conf/supervisor-chrome.conf
new file mode 100644
index 0000000..e8f2422
--- /dev/null
+++ b/php/5.6.x-apache/conf/supervisor-chrome.conf
@@ -0,0 +1,11 @@
+[program:chrome]
+# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
+# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
+command=DBUS_SESSION_BUS_ADDRESS=/dev/null DISPLAY=:99.0 sh -e /etc/init.d/xvfb start
+directory=/var/www/html
+autostart=false
+autorestart=true
+startretries=5
+stderr_logfile=/var/log/supervisor/xvfb.err.log
+stdout_logfile=/var/log/supervisor/xvfb.out.log
+user=www-data
diff --git a/php/7.0-apache/Dockerfile b/php/7.0-apache/Dockerfile
index 57adc1c..dc1ff3a 100644
--- a/php/7.0-apache/Dockerfile
+++ b/php/7.0-apache/Dockerfile
@@ -229,6 +229,16 @@ RUN curl -SL "https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-li
 
 COPY ./conf/supervisor-phantomjs.conf /etc/supervisor/conf.d/phantomjs.conf
 
+##
+# Headless Chrome
+##
+RUN curl -s https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
+    sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' && \
+    apt-get update && \
+    apt-get install google-chrome-stable xvfb -y
+
+COPY ./conf/supervisor-chrome.conf /etc/supervisor/conf.d/chrome.conf
+
 ENTRYPOINT ["docker-php-entrypoint"]
 
 COPY apache2-foreground /usr/local/bin/
diff --git a/php/7.0-apache/conf/supervisor-chrome.conf b/php/7.0-apache/conf/supervisor-chrome.conf
new file mode 100644
index 0000000..e8f2422
--- /dev/null
+++ b/php/7.0-apache/conf/supervisor-chrome.conf
@@ -0,0 +1,11 @@
+[program:chrome]
+# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
+# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
+command=DBUS_SESSION_BUS_ADDRESS=/dev/null DISPLAY=:99.0 sh -e /etc/init.d/xvfb start
+directory=/var/www/html
+autostart=false
+autorestart=true
+startretries=5
+stderr_logfile=/var/log/supervisor/xvfb.err.log
+stdout_logfile=/var/log/supervisor/xvfb.out.log
+user=www-data
diff --git a/php/7.0.x-apache/Dockerfile b/php/7.0.x-apache/Dockerfile
index 67fbf8e..8ac15f2 100644
--- a/php/7.0.x-apache/Dockerfile
+++ b/php/7.0.x-apache/Dockerfile
@@ -207,6 +207,16 @@ RUN curl -SL "https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-li
 
 COPY ./conf/supervisor-phantomjs.conf /etc/supervisor/conf.d/phantomjs.conf
 
+##
+# Headless Chrome
+##
+RUN curl -s https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
+    sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' && \
+    apt-get update && \
+    apt-get install google-chrome-stable xvfb -y
+
+COPY ./conf/supervisor-chrome.conf /etc/supervisor/conf.d/chrome.conf
+
 ENTRYPOINT ["docker-php-entrypoint"]
 
 COPY apache2-foreground /usr/local/bin/
diff --git a/php/7.0.x-apache/conf/supervisor-chrome.conf b/php/7.0.x-apache/conf/supervisor-chrome.conf
new file mode 100644
index 0000000..e8f2422
--- /dev/null
+++ b/php/7.0.x-apache/conf/supervisor-chrome.conf
@@ -0,0 +1,11 @@
+[program:chrome]
+# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
+# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
+command=DBUS_SESSION_BUS_ADDRESS=/dev/null DISPLAY=:99.0 sh -e /etc/init.d/xvfb start
+directory=/var/www/html
+autostart=false
+autorestart=true
+startretries=5
+stderr_logfile=/var/log/supervisor/xvfb.err.log
+stdout_logfile=/var/log/supervisor/xvfb.out.log
+user=www-data
diff --git a/php/7.1-apache/Dockerfile b/php/7.1-apache/Dockerfile
index c796f94..f2309be 100644
--- a/php/7.1-apache/Dockerfile
+++ b/php/7.1-apache/Dockerfile
@@ -231,6 +231,16 @@ RUN curl -SL "https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-li
 
 COPY ./conf/supervisor-phantomjs.conf /etc/supervisor/conf.d/phantomjs.conf
 
+##
+# Headless Chrome
+##
+RUN curl -s https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
+    sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' && \
+    apt-get update && \
+    apt-get install google-chrome-stable xvfb -y
+    
+COPY ./conf/supervisor-chrome.conf /etc/supervisor/conf.d/chrome.conf
+
 ENTRYPOINT ["docker-php-entrypoint"]
 
 COPY apache2-foreground /usr/local/bin/
diff --git a/php/7.1-apache/conf/supervisor-chrome.conf b/php/7.1-apache/conf/supervisor-chrome.conf
new file mode 100644
index 0000000..e8f2422
--- /dev/null
+++ b/php/7.1-apache/conf/supervisor-chrome.conf
@@ -0,0 +1,11 @@
+[program:chrome]
+# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
+# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
+command=DBUS_SESSION_BUS_ADDRESS=/dev/null DISPLAY=:99.0 sh -e /etc/init.d/xvfb start
+directory=/var/www/html
+autostart=false
+autorestart=true
+startretries=5
+stderr_logfile=/var/log/supervisor/xvfb.err.log
+stdout_logfile=/var/log/supervisor/xvfb.out.log
+user=www-data
diff --git a/php/7.1.x-apache/Dockerfile b/php/7.1.x-apache/Dockerfile
index 7b57b3e..c5a619d 100644
--- a/php/7.1.x-apache/Dockerfile
+++ b/php/7.1.x-apache/Dockerfile
@@ -209,6 +209,16 @@ RUN curl -SL "https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-li
 
 COPY ./conf/supervisor-phantomjs.conf /etc/supervisor/conf.d/phantomjs.conf
 
+##
+# Headless Chrome
+##
+RUN curl -s https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
+    sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' && \
+    apt-get update && \
+    apt-get install google-chrome-stable xvfb -y
+
+COPY ./conf/supervisor-chrome.conf /etc/supervisor/conf.d/chrome.conf
+
 ENTRYPOINT ["docker-php-entrypoint"]
 
 COPY apache2-foreground /usr/local/bin/
diff --git a/php/7.1.x-apache/conf/supervisor-chrome.conf b/php/7.1.x-apache/conf/supervisor-chrome.conf
new file mode 100644
index 0000000..e8f2422
--- /dev/null
+++ b/php/7.1.x-apache/conf/supervisor-chrome.conf
@@ -0,0 +1,11 @@
+[program:chrome]
+# DBUS_SESSION_BUS_ADDRESS is used to prevent deadlock
+# See https://stackoverflow.com/questions/41487659/nightwatch-selenium-socket-hang-up
+command=DBUS_SESSION_BUS_ADDRESS=/dev/null DISPLAY=:99.0 sh -e /etc/init.d/xvfb start
+directory=/var/www/html
+autostart=false
+autorestart=true
+startretries=5
+stderr_logfile=/var/log/supervisor/xvfb.err.log
+stdout_logfile=/var/log/supervisor/xvfb.out.log
+user=www-data