diff --git a/Dockerfile b/Dockerfile
index 59d8079..08630ce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,33 +1,16 @@
-FROM ubuntu:12.04
+FROM sameersbn/ubuntu:12.04.20140418
 MAINTAINER sameer@damagehead.com
-ENV DEBIAN_FRONTEND noninteractive
 
-RUN sed 's/main$/main universe/' -i /etc/apt/sources.list
-RUN apt-get update # 20140409
-
-# Fix some issues with APT packages.
-# See https://github.com/dotcloud/docker/issues/1024
-RUN dpkg-divert --local --rename --add /sbin/initctl && \
-		ln -sf /bin/true /sbin/initctl
-
-# essentials
-RUN apt-get install -y vim curl wget sudo net-tools pwgen unzip \
-			logrotate supervisor openssh-server && apt-get clean
-
-# build tools
-# RUN apt-get install -y gcc make && apt-get clean
-
-# image specific
-RUN apt-get install -y postgresql-9.1 postgresql-client-9.1 && apt-get clean
+RUN apt-get update && \
+		apt-get install -y postgresql-9.1 postgresql-client-9.1 && \
+		apt-get clean # 20140418
 
 ADD assets/ /app/
-RUN mv /app/.vimrc /app/.bash_aliases /root/
-RUN chmod 755 /app/init /app/setup/install && /app/setup/install
+RUN chmod 755 /app/init /app/setup/install
+RUN /app/setup/install
 
 ADD authorized_keys /root/.ssh/
-RUN chmod 700 /root/.ssh && chmod 600 /root/.ssh/authorized_keys && chown root:root -R /root/.ssh
 
-EXPOSE 22
 EXPOSE 5432
 
 VOLUME ["/var/lib/postgresql"]
diff --git a/assets/.bash_aliases b/assets/.bash_aliases
deleted file mode 100644
index d8e0acc..0000000
--- a/assets/.bash_aliases
+++ /dev/null
@@ -1,5 +0,0 @@
-PS1='${debian_chroot:+($debian_chroot)}[\u@\h \W]# '
-
-alias rm='rm -i'
-alias cp='cp -i'
-
diff --git a/assets/.vimrc b/assets/.vimrc
deleted file mode 100644
index dc3331e..0000000
--- a/assets/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-se ai
-se sw=2 ts=2
diff --git a/assets/init b/assets/init
index 87edbb0..701f6a7 100755
--- a/assets/init
+++ b/assets/init
@@ -9,6 +9,7 @@ echo User: root Password: $ROOT_PASSWORD
 
 # start supervisord
 /usr/bin/supervisord
+supervisorctl start sshd
 
 appStart () {
 	# fix permissions and ownership of /var/lib/postgresql
diff --git a/assets/setup/install b/assets/setup/install
index ed6c738..4232ea0 100644
--- a/assets/setup/install
+++ b/assets/setup/install
@@ -1,16 +1,5 @@
 #!/bin/bash
-
-mkdir -p /var/run/sshd
-cat > /etc/supervisor/conf.d/sshd.conf <<EOF
-[program:sshd]
-directory=/
-command=/usr/sbin/sshd -D
-user=root
-autostart=true
-autorestart=true
-stdout_logfile=/var/log/supervisor/%(program_name)s.log
-stderr_logfile=/var/log/supervisor/%(program_name)s_error.log
-EOF
+set -e
 
 # listen on all interfaces
 cat >> /etc/postgresql/9.1/main/postgresql.conf <<EOF