diff --git a/Dockerfile b/Dockerfile
index fa3a8c12..922a963f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,16 @@ MAINTAINER sameer@damagehead.com
 RUN sed 's/main$/main universe/' -i /etc/apt/sources.list
 RUN apt-get update && apt-get upgrade -y && apt-get clean # 20130925
 
-RUN apt-get install -y wget curl unzip build-essential checkinstall zlib1g-dev libyaml-dev libssl-dev \
+# essentials
+RUN apt-get install -y vim curl wget sudo net-tools && \
+	apt-get install -y 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 unzip build-essential checkinstall zlib1g-dev libyaml-dev libssl-dev \
 		libgdbm-dev libreadline-dev libncurses5-dev libffi-dev && \
 		apt-get clean
 
@@ -23,6 +32,7 @@ RUN wget ftp://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p353.tar.gz -O - | tar
 		gem install --no-ri --no-rdoc bundler
 
 ADD resources/ /gitlab/
+RUN mv /gitlab/.vimrc /gitlab/.bash_aliases /root/
 RUN chmod 755 /gitlab/gitlab /gitlab/setup/install && /gitlab/setup/install
 
 ADD authorized_keys /root/.ssh/
diff --git a/resources/.bash_aliases b/resources/.bash_aliases
new file mode 100644
index 00000000..d8e0acc6
--- /dev/null
+++ b/resources/.bash_aliases
@@ -0,0 +1,5 @@
+PS1='${debian_chroot:+($debian_chroot)}[\u@\h \W]# '
+
+alias rm='rm -i'
+alias cp='cp -i'
+
diff --git a/resources/.vimrc b/resources/.vimrc
new file mode 100644
index 00000000..dc3331e9
--- /dev/null
+++ b/resources/.vimrc
@@ -0,0 +1,2 @@
+se ai
+se sw=2 ts=2