diff --git a/Dockerfile b/Dockerfile
index 3d0800729..22cd42810 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,6 +42,7 @@ RUN ln -sf /dev/stderr /var/log/nginx/error.log
 RUN mkdir -p /usr/src/app
 RUN mkdir -p /usr/src/app/config
 RUN mkdir -p /usr/src/app/invoices
+RUN mkdir -p /usr/src/app/exports
 RUN mkdir -p /usr/src/app/log
 RUN mkdir -p /usr/src/app/public/uploads
 RUN mkdir -p /usr/src/app/public/assets
@@ -56,6 +57,7 @@ COPY . /usr/src/app
 
 # Volumes
 VOLUME /usr/src/app/invoices
+VOLUME /usr/src/app/exports
 VOLUME /usr/src/app/public/uploads
 VOLUME /usr/src/app/public/assets
 VOLUME /var/log/supervisor
diff --git a/config/deploy.rb b/config/deploy.rb
index 00b46b0a9..d9f16dcf3 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -42,6 +42,8 @@ namespace :deploy do
     run "mkdir -p #{shared_path}/config"
     run "mkdir -p #{shared_path}/uploads"
     run "mkdir -p #{shared_path}/invoices"
+    run "mkdir -p #{shared_path}/exports"
+    run "mkdir -p #{shared_path}/plugins"
     put File.read("config/database.yml"), "#{shared_path}/config/database.yml"
     puts "Now edit #{shared_path}/config/database.yml and add your username and password"
     put File.read("config/application.yml"), "#{shared_path}/config/application.yml"
@@ -92,6 +94,20 @@ namespace :deploy do
   end
   after "deploy:finalize_update", 'deploy:symlink_invoices_dir'
 
+  desc "Symlinks the exports dir"
+  task :symlink_exports_dir, :roles => :app do
+    run "rm -rf #{release_path}/exports"
+    run "ln -nfs #{shared_path}/exports/ #{release_path}/"
+  end
+  after "deploy:finalize_update", 'deploy:symlink_exports_dir'
+
+  desc "Symlinks the plugins dir"
+  task :symlink_plugins_dir, :roles => :app do
+    run "rm -rf #{release_path}/plugins"
+    run "ln -nfs #{shared_path}/plugins/ #{release_path}/"
+  end
+  after "deploy:finalize_update", 'deploy:symlink_plugins_dir'
+
   namespace :assets do
     desc 'Run the precompile task locally and rsync with shared'
     task :precompile, :roles => :web, :except => { :no_release => true } do
diff --git a/docker/README.md b/docker/README.md
index 022772ddf..bf920d425 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -248,6 +248,7 @@ docker run --restart=always -d --name=fabmanager \
              -v /home/core/fabmanager/public/assets:/usr/src/app/public/assets \
              -v /home/core/fabmanager/public/uploads:/usr/src/app/public/uploads \
              -v /home/core/fabmanager/invoices:/usr/src/app/invoices \
+             -v /home/core/fabmanager/exports:/usr/src/app/exports \
              -v /home/core/fabmanager/plugins:/usr/src/app/plugins \
              -v /home/core/fabmanager/log:/var/log/supervisor \
              -v /home/core/fabmanager/letsencrypt/etc:/etc/letsencrypt \
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 44870f5a3..061e55c66 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -15,6 +15,7 @@ services:
       - /home/core/fabmanager/public/assets:/usr/src/app/public/assets
       - /home/core/fabmanager/public/uploads:/usr/src/app/public/uploads
       - /home/core/fabmanager/invoices:/usr/src/app/invoices
+      - /home/core/fabmanager/exports:/usr/src/app/exports
       - /home/core/fabmanager/log:/var/log/supervisor
       - /home/core/fabmanager/plugins:/usr/src/app/plugins
       - /home/core/fabmanager/letsencrypt/etc:/etc/letsencrypt