diff --git a/Dockerfile b/Dockerfile
index 7d813bd5d5..2f9766efaa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,7 @@
 FROM phusion/baseimage:0.9.16
 
+ENV baseDir .
+
 # Install Node.js and Grunt
 RUN curl -sL https://deb.nodesource.com/setup | sudo bash -
 RUN apt-get install -y build-essential nodejs
@@ -20,9 +22,9 @@ RUN git clone https://github.com/sharelatex/sharelatex.git /var/www/sharelatex
 RUN apt-get install -y zlib1g-dev
 
 
-ADD services.js /var/www/sharelatex/config/services.js
-ADD package.json /var/www/package.json
-ADD git-revision.js /var/www/git-revision.js
+ADD ${baseDir}/services.js /var/www/sharelatex/config/services.js
+ADD ${baseDir}/package.json /var/www/package.json
+ADD ${baseDir}/git-revision.js /var/www/git-revision.js
 RUN cd /var/www && npm install
 
 RUN cd /var/www/sharelatex; \
@@ -39,11 +41,11 @@ RUN cd /var/www/sharelatex/web; \
 run apt-get update
 RUN apt-get install -y nginx;
 RUN rm /etc/nginx/sites-enabled/default
-ADD nginx/nginx.conf /etc/nginx/nginx.conf
-ADD nginx/sharelatex.conf /etc/nginx/sites-enabled/sharelatex.conf
+ADD ${baseDir}/nginx/nginx.conf /etc/nginx/nginx.conf
+ADD ${baseDir}/nginx/sharelatex.conf /etc/nginx/sites-enabled/sharelatex.conf
 
 RUN mkdir /etc/service/nginx
-ADD runit/nginx.sh /etc/service/nginx/run
+ADD ${baseDir}/runit/nginx.sh /etc/service/nginx/run
 
 # Set up ShareLaTeX services to run automatically on boot
 RUN mkdir /etc/service/chat-sharelatex; \
@@ -57,16 +59,16 @@ RUN mkdir /etc/service/chat-sharelatex; \
 	mkdir /etc/service/track-changes-sharelatex; \
 	mkdir /etc/service/web-sharelatex; 
 
-ADD runit/chat-sharelatex.sh             /etc/service/chat-sharelatex/run
-ADD runit/clsi-sharelatex.sh             /etc/service/clsi-sharelatex/run
-ADD runit/docstore-sharelatex.sh         /etc/service/docstore-sharelatex/run
-ADD runit/document-updater-sharelatex.sh /etc/service/document-updater-sharelatex/run
-ADD runit/filestore-sharelatex.sh        /etc/service/filestore-sharelatex/run
-ADD runit/real-time-sharelatex.sh        /etc/service/real-time-sharelatex/run
-ADD runit/spelling-sharelatex.sh         /etc/service/spelling-sharelatex/run
-ADD runit/tags-sharelatex.sh             /etc/service/tags-sharelatex/run
-ADD runit/track-changes-sharelatex.sh    /etc/service/track-changes-sharelatex/run
-ADD runit/web-sharelatex.sh              /etc/service/web-sharelatex/run
+ADD ${baseDir}/runit/chat-sharelatex.sh             /etc/service/chat-sharelatex/run
+ADD ${baseDir}/runit/clsi-sharelatex.sh             /etc/service/clsi-sharelatex/run
+ADD ${baseDir}/runit/docstore-sharelatex.sh         /etc/service/docstore-sharelatex/run
+ADD ${baseDir}/runit/document-updater-sharelatex.sh /etc/service/document-updater-sharelatex/run
+ADD ${baseDir}/runit/filestore-sharelatex.sh        /etc/service/filestore-sharelatex/run
+ADD ${baseDir}/runit/real-time-sharelatex.sh        /etc/service/real-time-sharelatex/run
+ADD ${baseDir}/runit/spelling-sharelatex.sh         /etc/service/spelling-sharelatex/run
+ADD ${baseDir}/runit/tags-sharelatex.sh             /etc/service/tags-sharelatex/run
+ADD ${baseDir}/runit/track-changes-sharelatex.sh    /etc/service/track-changes-sharelatex/run
+ADD ${baseDir}/runit/web-sharelatex.sh              /etc/service/web-sharelatex/run
 
 # Install TexLive
 RUN apt-get install -y wget
@@ -93,14 +95,14 @@ RUN apt-get install -y unzip
 RUN apt-get install -y imagemagick optipng
 
 # phusion/baseimage init script
-ADD 00_regen_sharelatex_secrets.sh  /etc/my_init.d/00_regen_sharelatex_secrets.sh
-ADD 00_make_sharelatex_data_dirs.sh /etc/my_init.d/00_make_sharelatex_data_dirs.sh
-ADD 00_set_docker_host_ipaddress.sh /etc/my_init.d/00_set_docker_host_ipaddress.sh
-ADD 99_migrate.sh /etc/my_init.d/99_migrate.sh
+ADD ${baseDir}/00_regen_sharelatex_secrets.sh  /etc/my_init.d/00_regen_sharelatex_secrets.sh
+ADD ${baseDir}/00_make_sharelatex_data_dirs.sh /etc/my_init.d/00_make_sharelatex_data_dirs.sh
+ADD ${baseDir}/00_set_docker_host_ipaddress.sh /etc/my_init.d/00_set_docker_host_ipaddress.sh
+ADD ${baseDir}/99_migrate.sh /etc/my_init.d/99_migrate.sh
 
 # Install ShareLaTeX settings file
 RUN mkdir /etc/sharelatex
-ADD settings.coffee /etc/sharelatex/settings.coffee
+ADD ${baseDir}/settings.coffee /etc/sharelatex/settings.coffee
 ENV SHARELATEX_CONFIG /etc/sharelatex/settings.coffee
 
 EXPOSE 80