diff --git a/Dockerfile b/Dockerfile
index 5959765..c232922 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,6 +21,7 @@ RUN echo "daemon off;" >> /etc/nginx/nginx.conf
 RUN git clone https://github.com/Netflix/scumblr.git /scumblr 
 
 # Install rvm, ruby, bundler, sidekiq
+RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import
 RUN curl -sSL https://get.rvm.io | bash -s stable
 RUN /bin/bash -l -c "rvm requirements"
 RUN /bin/bash -l -c "rvm install 2.0.0-p481"
diff --git a/scripts/start-server.sh b/scripts/start-server.sh
index fc8f143..3621ff5 100644
--- a/scripts/start-server.sh
+++ b/scripts/start-server.sh
@@ -2,9 +2,15 @@
 
 source /etc/profile.d/rvm.sh
 
-git clone https://github.com/Netflix/scumblr.git /scumblr 
+{ # your 'try' block
+    git clone https://github.com/Netflix/scumblr.git /scumblr  &&
+    mv output
+} || { # your 'catch' block
+    mv log
+}
+
+ rm tmp cd /scumblr
 
-cd /scumblr
 
 if [ "$SCUMBLR_CREATE_DB" == "true" ]
 then