diff --git a/Dockerfile b/Dockerfile
index 75d4f560..4c4e1012 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,24 +2,7 @@ FROM ubuntu:14.04
 
 ENV HOME /home/stackage
 ENV LANG en_US.UTF-8
-
-RUN mkdir /home/stackage -p
-RUN locale-gen en_US.UTF-8
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get update
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common python-software-properties git
-RUN DEBIAN_FRONTEND=noninteractive add-apt-repository ppa:hvr/ghc -y
+ENV PATH /opt/ghc/7.10.3/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh
-RUN DEBIAN_FRONTEND=noninteractive bash /tmp/debian-bootstrap.sh
-RUN rm /tmp/debian-bootstrap.sh
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y cabal-install-1.22 ghc-7.10.3 ghc-7.10.3-htmldocs alex-3.1.3 happy-1.19.4 sudo
-
-ENV PATH /home/stackage/.cabal/bin:/usr/local/sbin:/usr/local/bin:/opt/ghc/7.10.3/bin:/opt/cabal/1.22/bin:/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
-RUN cabal update
-RUN cabal install hscolour cabal-install && cp $HOME/.cabal/bin/* /usr/local/bin && rm -rf $HOME/.cabal $HOME/.ghc /tmp/stackage
-RUN wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2 && bunzip2 stackage-curator.bz2 && chmod +x stackage-curator && mv stackage-curator /usr/local/bin
-# Get new hyperlinked Haddocks
-# RUN mkdir -p /opt/haddock && cd /opt/haddock && wget https://s3.amazonaws.com/download.fpcomplete.com/michael/haddock-2.16.2.tar.gz && tar zxf haddock-2.16.2.tar.gz && rm -f /opt/ghc/7.10.3/bin/haddock && ln -s /opt/haddock/2.16.2/bin/haddock /opt/ghc/7.10.3/bin/haddock
+RUN /tmp/debian-bootstrap.sh && rm /tmp/debian-bootstrap.sh
diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index 056b6d51..fbf596ff 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -12,6 +12,14 @@
 
 set -exu
 
+mkdir /home/stackage -p
+locale-gen en_US.UTF-8
+
+export DEBIAN_FRONTEND=noninteractive
+apt-get update
+apt-get install -y software-properties-common python-software-properties git
+
+add-apt-repository ppa:hvr/ghc -y
 add-apt-repository -y ppa:zoogie/sdl2-snapshots
 add-apt-repository -y ppa:marutter/rrutter
 add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse
@@ -23,6 +31,10 @@ echo 'deb http://download.fpcomplete.com/ubuntu trusty main'|sudo tee /etc/apt/s
 apt-get update
 apt-get install -y \
     build-essential \
+    ghc-7.10.3 \
+    ghc-7.10.3-htmldocs \
+    hscolour \
+    sudo \
     curl \
     freeglut3-dev \
     git \