diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c0d8ae..7814290 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,12 +27,10 @@ before_script:
   only:
     - master
 
-ruby-2.1 test: *test_build
-ruby-2.2 test: *test_build
-ruby-2.3 test: *test_build
+ruby-2.1-git-2.7-phantomjs-2.1 test: *test_build
+ruby-2.3-git-2.7-phantomjs-2.1 test: *test_build
 www-gitlab-com test: *test_build
 
-ruby-2.1: *build_and_deploy
-ruby-2.2: *build_and_deploy
-ruby-2.3: *build_and_deploy
+ruby-2.1-git-2.7-phantomjs-2.1: *build_and_deploy
+ruby-2.3-git-2.7-phantomjs-2.1: *build_and_deploy
 www-gitlab-com: *build_and_deploy
diff --git a/Dockerfile.ruby-2.1 b/Dockerfile.ruby-2.1
deleted file mode 100644
index 35cd5f1..0000000
--- a/Dockerfile.ruby-2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-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-git-2.7-phantomjs-2.1 b/Dockerfile.ruby-2.1-git-2.7-phantomjs-2.1
new file mode 100644
index 0000000..f6d9186
--- /dev/null
+++ b/Dockerfile.ruby-2.1-git-2.7-phantomjs-2.1
@@ -0,0 +1,10 @@
+FROM ruby:2.1
+
+ADD / /
+RUN /scripts/install-essentials
+RUN /scripts/install-phantomjs 2.1.1
+
+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
diff --git a/Dockerfile.ruby-2.2 b/Dockerfile.ruby-2.2
deleted file mode 100644
index d0e1760..0000000
--- a/Dockerfile.ruby-2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-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.3 b/Dockerfile.ruby-2.3
deleted file mode 100644
index 6f649c8..0000000
--- a/Dockerfile.ruby-2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-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-git-2.7-phantomjs-2.1 b/Dockerfile.ruby-2.3-git-2.7-phantomjs-2.1
new file mode 100644
index 0000000..4241ed6
--- /dev/null
+++ b/Dockerfile.ruby-2.3-git-2.7-phantomjs-2.1
@@ -0,0 +1,10 @@
+FROM ruby:2.3
+
+ADD / /
+RUN /scripts/install-essentials
+RUN /scripts/install-phantomjs 2.1.1
+
+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
diff --git a/scripts/install-essentials b/scripts/install-essentials
index 0d17128..eeaaa52 100755
--- a/scripts/install-essentials
+++ b/scripts/install-essentials
@@ -11,7 +11,10 @@ apt-get install -y \
 	libxslt-dev libcurl4-openssl-dev libicu-dev \
 	logrotate python-docutils pkg-config cmake nodejs \
 	libkrb5-dev postgresql-client mysql-client unzip \
-	$PACKAGES
+
+echo deb http://httpredir.debian.org/debian stretch main > /etc/apt/sources.list
+apt-get update -yqqq
+apt-get install -yqq --force-yes git
 
 # Set UTF-8
 # http://stackoverflow.com/a/3182519/2137281
diff --git a/scripts/install-git b/scripts/install-git
deleted file mode 100755
index 5a14926..0000000
--- a/scripts/install-git
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -xeo pipefail
-
-cd /tmp
-wget https://www.kernel.org/pub/software/scm/git/git-2.7.4.tar.gz
-echo '7104c4f5d948a75b499a954524cb281fe30c6649d8abe20982936f75ec1f275b  git-2.7.4.tar.gz' | shasum -a256 -c -
-tar -xzf git-2.7.4.tar.gz
-
-cd git-2.7.4/
-./configure
-make prefix=/usr/local all
-
-cd /
-rm -rf /tmp/*
diff --git a/scripts/install-phantomjs b/scripts/install-phantomjs
index 9de98b2..f58d58e 100755
--- a/scripts/install-phantomjs
+++ b/scripts/install-phantomjs
@@ -3,6 +3,9 @@
 set -xeo pipefail
 
 cd /tmp
-wget -q https://gitlab.com/axil/phantomjs-debian/raw/master/phantomjs_1.9.8-0jessie_amd64.deb
-dpkg -i phantomjs_1.9.8-0jessie_amd64.deb
-rm /tmp/*
+
+PHANTOMJS_VERSION=${1:-1.9.8}
+PHANTOMJS_FILE="phantomjs-$PHANTOMJS_VERSION-linux-x86_64"
+curl -L "https://bitbucket.org/ariya/phantomjs/downloads/$PHANTOMJS_FILE.tar.bz2" | tar jx
+cp "$PHANTOMJS_FILE/bin/phantomjs" "/usr/bin/"
+rm -rf /tmp/*