diff --git a/Dockerfile.diaspora b/Dockerfile.diaspora
index 2eea43b..806cabe 100644
--- a/Dockerfile.diaspora
+++ b/Dockerfile.diaspora
@@ -25,8 +25,15 @@ RUN addgroup --system --gid ${EXT_GID} diaspora
 RUN adduser --system --uid ${EXT_UID} --gid ${EXT_GID} diaspora
 
 USER diaspora
-RUN mkdir /home/diaspora/diaspora
-WORKDIR /home/diaspora/diaspora
+ENV DIASPORA_HOME /home/diaspora/diaspora
+RUN mkdir $DIASPORA_HOME
+WORKDIR $DIASPORA_HOME
+
+ENV GEM_HOME $DIASPORA_HOME/vendor/bundle
+ENV BUNDLE_PATH="$GEM_HOME" \
+        BUNDLE_BIN="$GEM_HOME/bin" \
+        BUNDLE_APP_CONFIG="$DIASPORA_HOME/.bundle"
+ENV PATH $BUNDLE_BIN:$PATH
 
 # Finish setup
 COPY ./start.sh ../start.sh
diff --git a/start.sh b/start.sh
index b46356e..d34f6c4 100755
--- a/start.sh
+++ b/start.sh
@@ -2,7 +2,6 @@
 
 action_install_gems() {
   script/configure_bundler
-  bin/bundle config --local path vendor/bundle
   bin/bundle install --full-index
 }