diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..751b1d0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+build.log
diff --git a/Dockerfile b/Dockerfile
index a96349f..c0455ce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,7 @@
 FROM ubuntu:16.04
 
+ADD ./sources.list /etc/apt/sources.list
+
 RUN echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
 ADD ./run.sh /tmp/run.sh
 RUN bash /tmp/run.sh && rm /tmp/run.sh
diff --git a/run.sh b/run.sh
index 0f946f5..f81d7ca 100644
--- a/run.sh
+++ b/run.sh
@@ -46,6 +46,7 @@ PKGS="
     python
     python-dev
     python-pip
+    python-software-properties
     rbenv
     rsync
     rsyslog
@@ -69,38 +70,42 @@ PKGS="
 
 apt-get update
 apt-get -y upgrade
-apt-get install -y $PKGS
+
+for PKG in $PKGS ; do
+    apt-get install -y $PKG
+done
 
 # install docker
-apt-get install apt-transport-https ca-certificates
-apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 \
-        --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" > \
-    /etc/apt/sources.list.d/docker.list
-apt-get update
-apt-get install docker-engine
+apt-get install -y docker
+#apt-get install apt-transport-https ca-certificates
+#apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 \
+#        --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+#echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" > \
+#    /etc/apt/sources.list.d/docker.list
+#apt-get update
+#apt-get install docker-engine
 
 # install docker machine (this is gross):
-curl -L https://github.com/docker/machine/releases/download/v0.6.0/docker-machine-`uname -s`-`uname -m` > /usr/local/bin/docker-machine && \
+curl -L \
+https://github.com/docker/machine/releases/download/v0.6.0/docker-machine-`uname -s`-`uname -m` > \
+    /usr/local/bin/docker-machine && \
     chmod +x /usr/local/bin/docker-machine
 
 # install docker compose (also gross):
-curl -L
-https://github.com/docker/compose/releases/download/1.6.2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose && \
+curl -L \
+https://github.com/docker/compose/releases/download/1.6.2/docker-compose-`uname -s`-`uname -m` > \
+    /usr/local/bin/docker-compose && \
     chmod +x /usr/local/bin/docker-compose
+
 # and completion
-curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose version --short)/contrib/completion/bash/docker-compose > \
+curl -L \
+https://raw.githubusercontent.com/docker/compose/$(docker-compose version --short)/contrib/completion/bash/docker-compose > \
  /etc/bash_completion.d/docker-compose
 
 # install neovim
 add-apt-repository ppa:neovim-ppa/unstable
 apt-get update
-sudo apt-get install neovim
-
-# use faster parallel bzip2:
-OLD="$(which bzip2)"
-rm $OLD
-ln $(which pbzip2) $OLD
+apt-get install neovim
 
 # install ruby-build for rbenv install
 git clone https://github.com/rbenv/ruby-build.git /root/.rbenv/plugins/ruby-build
diff --git a/sources.list b/sources.list
new file mode 100644
index 0000000..987eb0a
--- /dev/null
+++ b/sources.list
@@ -0,0 +1,4 @@
+deb mirror://mirrors.ubuntu.com/mirrors.txt xenial main universe
+deb mirror://mirrors.ubuntu.com/mirrors.txt xenial-updates main universe
+deb mirror://mirrors.ubuntu.com/mirrors.txt xenial-security main universe
+deb mirror://mirrors.ubuntu.com/mirrors.txt xenial-backports main universe