diff --git a/Dockerfile.ruby-2.1 b/Dockerfile.ruby-2.1
index 35cd5f1..9868f32 100644
--- a/Dockerfile.ruby-2.1
+++ b/Dockerfile.ruby-2.1
@@ -1,14 +1,8 @@
 FROM ruby:2.1
 
-ENV PACKAGES="git-core"
+ENV PACKAGES="git-core" \
+	LC_ALL=en_US.UTF-8
 
 ADD / /
 RUN /scripts/install-essentials
-
-# Set UTF-8 http://jaredmarkell.com/docker-and-locales/
-# Must be set after install-essentials is run
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-
-RUN /scripts/install-phantomjs
+RUN /scripts/install-phantomjs 2.1.1
diff --git a/Dockerfile.ruby-2.1-gitlab-8.11 b/Dockerfile.ruby-2.1-gitlab-8.11
new file mode 100644
index 0000000..35cd5f1
--- /dev/null
+++ b/Dockerfile.ruby-2.1-gitlab-8.11
@@ -0,0 +1,14 @@
+FROM ruby:2.1
+
+ENV PACKAGES="git-core"
+
+ADD / /
+RUN /scripts/install-essentials
+
+# Set UTF-8 http://jaredmarkell.com/docker-and-locales/
+# Must be set after install-essentials is run
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+RUN /scripts/install-phantomjs
diff --git a/Dockerfile.ruby-2.1-phantomjs2 b/Dockerfile.ruby-2.1-phantomjs2
deleted file mode 100644
index 9868f32..0000000
--- a/Dockerfile.ruby-2.1-phantomjs2
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM ruby:2.1
-
-ENV PACKAGES="git-core" \
-	LC_ALL=en_US.UTF-8
-
-ADD / /
-RUN /scripts/install-essentials
-RUN /scripts/install-phantomjs 2.1.1
diff --git a/Dockerfile.ruby-2.2 b/Dockerfile.ruby-2.2
index d0e1760..46fcdd2 100644
--- a/Dockerfile.ruby-2.2
+++ b/Dockerfile.ruby-2.2
@@ -1,14 +1,8 @@
 FROM ruby:2.2
 
-ENV PACKAGES="git-core"
+ENV PACKAGES="git-core" \
+	LC_ALL=en_US.UTF-8
 
 ADD / /
 RUN /scripts/install-essentials
-
-# Set UTF-8 http://jaredmarkell.com/docker-and-locales/
-# Must be set after install-essentials is run
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-
-RUN /scripts/install-phantomjs
+RUN /scripts/install-phantomjs 2.1.1
diff --git a/Dockerfile.ruby-2.2-gitlab-8.11 b/Dockerfile.ruby-2.2-gitlab-8.11
new file mode 100644
index 0000000..d0e1760
--- /dev/null
+++ b/Dockerfile.ruby-2.2-gitlab-8.11
@@ -0,0 +1,14 @@
+FROM ruby:2.2
+
+ENV PACKAGES="git-core"
+
+ADD / /
+RUN /scripts/install-essentials
+
+# Set UTF-8 http://jaredmarkell.com/docker-and-locales/
+# Must be set after install-essentials is run
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+RUN /scripts/install-phantomjs
diff --git a/Dockerfile.ruby-2.2-phantomjs2 b/Dockerfile.ruby-2.2-phantomjs2
deleted file mode 100644
index 46fcdd2..0000000
--- a/Dockerfile.ruby-2.2-phantomjs2
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM ruby:2.2
-
-ENV PACKAGES="git-core" \
-	LC_ALL=en_US.UTF-8
-
-ADD / /
-RUN /scripts/install-essentials
-RUN /scripts/install-phantomjs 2.1.1
diff --git a/Dockerfile.ruby-2.3 b/Dockerfile.ruby-2.3
index 6f649c8..02be75b 100644
--- a/Dockerfile.ruby-2.3
+++ b/Dockerfile.ruby-2.3
@@ -1,14 +1,8 @@
-FROM ruby:2.3.1
+FROM ruby:2.3
 
-ENV PACKAGES="git-core"
+ENV PACKAGES="git-core" \
+	LC_ALL=en_US.UTF-8
 
 ADD / /
 RUN /scripts/install-essentials
-
-# Set UTF-8 http://jaredmarkell.com/docker-and-locales/
-# Must be set after install-essentials is run
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-
-RUN /scripts/install-phantomjs
+RUN /scripts/install-phantomjs 2.1.1
diff --git a/Dockerfile.ruby-2.3-gitlab-8.11 b/Dockerfile.ruby-2.3-gitlab-8.11
new file mode 100644
index 0000000..6f649c8
--- /dev/null
+++ b/Dockerfile.ruby-2.3-gitlab-8.11
@@ -0,0 +1,14 @@
+FROM ruby:2.3.1
+
+ENV PACKAGES="git-core"
+
+ADD / /
+RUN /scripts/install-essentials
+
+# Set UTF-8 http://jaredmarkell.com/docker-and-locales/
+# Must be set after install-essentials is run
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+RUN /scripts/install-phantomjs
diff --git a/Dockerfile.ruby-2.3-phantomjs2 b/Dockerfile.ruby-2.3-phantomjs2
deleted file mode 100644
index 02be75b..0000000
--- a/Dockerfile.ruby-2.3-phantomjs2
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM ruby:2.3
-
-ENV PACKAGES="git-core" \
-	LC_ALL=en_US.UTF-8
-
-ADD / /
-RUN /scripts/install-essentials
-RUN /scripts/install-phantomjs 2.1.1