diff --git a/server-ce/Dockerfile b/server-ce/Dockerfile
index 29805850c9..ccf203b6cd 100644
--- a/server-ce/Dockerfile
+++ b/server-ce/Dockerfile
@@ -90,10 +90,6 @@ ENV OPTIMISE_PDF "true"
 ENV SHARELATEX_FPH_INITIALIZE_NEW_PROJECTS "true"
 ENV SHARELATEX_FPH_DISPLAY_NEW_PROJECTS "true"
 
-ENV SHARELATEX_HISTORY_BACKEND "fs"
-ENV SHARELATEX_HISTORY_PROJECT_BLOBS_BUCKET "/var/lib/sharelatex/data/history/overleaf-project-blobs"
-ENV SHARELATEX_HISTORY_CHUNKS_BUCKET "/var/lib/sharelatex/data/history/overleaf-chunks"
-
 # Phusion Image timeouts before sending SIGKILL to processes
 # ----------------------------------------------------------
 ENV KILL_PROCESS_TIMEOUT 55
diff --git a/server-ce/config/production.json b/server-ce/config/production.json
index b66a373d01..d3f4fa225a 100644
--- a/server-ce/config/production.json
+++ b/server-ce/config/production.json
@@ -1,5 +1,6 @@
 {
   "persistor": {
+    "backend": "fs",
     "useSubdirectories": true
   },
   "basicHttpAuth": {
@@ -7,8 +8,17 @@
   },
   "useDeleteObjects": "false",
   "jwtAuth": {
-    "key": "secureKey",
     "algorithm": "HS256"
   },
-  "mongo": {}
+  "mongo": {},
+  "blobStore": {
+    "globalBucket": "/var/lib/sharelatex/data/history/overleaf-global-blobs",
+    "projectBucket": "/var/lib/sharelatex/data/history/overleaf-project-blobs"
+  },
+  "chunkStore": {
+    "bucket": "/var/lib/sharelatex/data/history/overleaf-chunks"
+  },
+  "zipStore": {
+    "bucket": "/var/lib/sharelatex/data/history/overleaf-zips"
+  }
 }
diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js
index fcbd390957..d77a84a599 100644
--- a/services/web/config/settings.defaults.js
+++ b/services/web/config/settings.defaults.js
@@ -235,6 +235,11 @@ module.exports = {
     recurly: {},
   },
 
+  jwt: {
+    key: process.env.OT_JWT_AUTH_KEY,
+    algorithm: process.env.OT_JWT_AUTH_ALG || 'HS256',
+  },
+
   splitTests: [],
 
   // Where your instance of ShareLaTeX can be found publically. Used in emails