diff --git a/Dockerfile b/Dockerfile
index 8f915d53..358dce03 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,23 +2,19 @@ FROM ubuntu:12.04
 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 update && apt-get upgrade -y && apt-get install -y wget curl unzip && apt-get clean # 20131122
+
+RUN apt-get install -y build-essential checkinstall zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \
+	&& apt-get clean
+
+RUN wget ftp://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p247.tar.gz -O - | tar -zxf - -C /tmp/ && \
+	cd /tmp/ruby-2.0.0-p247/ && ./configure --disable-install-rdoc --enable-pthread --prefix=/usr && make && make install && \
+	cd /tmp \
+	rm -rf /tmp/ruby-2.0.0-p247 && gem install --no-ri --no-rdoc bundler
 
 RUN apt-get install -y python-software-properties && add-apt-repository -y ppa:git-core/ppa && \
-		apt-get update && apt-get install -y sudo vim unzip wget curl nginx git-core postfix \
-			mysql-server openssh-server redis-server python-docutils postfix  && apt-get clean
-
-RUN apt-get install -y gcc g++ make libcurl4-openssl-dev libssl-dev \
-      libicu-dev libmysqlclient-dev libxml2-dev libxslt1-dev libffi-dev libyaml-dev \
-      zlib1g-dev libgdbm-dev libreadline-dev libncurses5-dev && apt-get clean
-
-RUN wget ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p448.tar.gz -O - | tar -zxf - -C /tmp/ && \
-    cd /tmp/ruby-1.9.3-p448/ && ./configure --enable-pthread --prefix=/usr && make && make install && \
-    cd /tmp/ruby-1.9.3-p448/ext/openssl/ && ruby extconf.rb && make && make install && \
-    cd /tmp/ruby-1.9.3-p448/ext/zlib && ruby extconf.rb && make && make install && cd /tmp \
-    rm -rf /tmp/ruby-1.9.3-p448 && gem install --no-ri --no-rdoc bundler
-
-RUN apt-get install -y supervisor
+	apt-get update && apt-get install -y libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev libmysqlclient-dev \
+	sudo nginx git-core mysql-server openssh-server redis-server python-docutils postfix logrotate supervisor && apt-get clean
 
 ADD resources/install /gitlab/setup/install
 ADD resources/start /gitlab/start
diff --git a/resources/install b/resources/install
index 9e3916ea..ed5bedc6 100755
--- a/resources/install
+++ b/resources/install
@@ -8,7 +8,7 @@ adduser --disabled-login --gecos 'GitLab' git
 
 # install gitlab-shell
 sudo -u git -H mkdir -p /home/git/gitlab-shell
-wget "https://github.com/gitlabhq/gitlab-shell/archive/v1.7.1.tar.gz" -O - | tar -zxf - --strip=1 -C /home/git/gitlab-shell/
+wget "https://github.com/gitlabhq/gitlab-shell/archive/v1.7.9.tar.gz" -O - | tar -zxf - --strip=1 -C /home/git/gitlab-shell/
 chown -R git:git /home/git/gitlab-shell/
 
 cd /home/git/gitlab-shell
@@ -17,7 +17,7 @@ sudo -u git -H ./bin/install
 
 # install gitlab
 sudo -u git -H mkdir -p /home/git/gitlab
-wget "https://github.com/gitlabhq/gitlabhq/archive/v6.1.0.tar.gz" -O - | tar -zxf - --strip=1 -C /home/git/gitlab/
+wget "https://github.com/gitlabhq/gitlabhq/archive/v6.3.0.tar.gz" -O - | tar -zxf - --strip=1 -C /home/git/gitlab/
 chown -R git:git /home/git/gitlab/
 
 cd /home/git/gitlab
@@ -26,6 +26,7 @@ cd /home/git/gitlab
 sudo -u git -H cp config/gitlab.yml.example config/gitlab.yml
 sudo -u git -H cp config/resque.yml.example config/resque.yml
 sudo -u git -H cp config/unicorn.rb.example config/unicorn.rb
+sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb
 
 # create required tmp and log directories
 sudo -u git -H mkdir -p tmp/pids/ tmp/sockets/