diff --git a/services/filestore/app/coffee/LocalFileWriter.coffee b/services/filestore/app/coffee/LocalFileWriter.coffee
index 71cbb32622..a839c46656 100644
--- a/services/filestore/app/coffee/LocalFileWriter.coffee
+++ b/services/filestore/app/coffee/LocalFileWriter.coffee
@@ -4,6 +4,7 @@ path = require("path")
 _ = require("underscore")
 logger = require("logger-sharelatex")
 metrics = require("metrics-sharelatex")
+Settings = require("settings-sharelatex")
 
 module.exports = 
 
@@ -33,4 +34,4 @@ module.exports =
 		if !key?
 			key = uuid.v1()
 		key = key.replace(/\//g,"-")
-		path.join(__dirname, "../../uploads/#{key}")
+		path.join(Settings.path.uploadFolder, key)
diff --git a/services/filestore/config/settings.defaults.coffee b/services/filestore/config/settings.defaults.coffee
index 642e1b5c3d..a7c92528ac 100644
--- a/services/filestore/config/settings.defaults.coffee
+++ b/services/filestore/config/settings.defaults.coffee
@@ -26,6 +26,9 @@ module.exports =
 		# 	key: ""
 		# 	secret: ""
 
+	path:
+		uploadFolder: Path.resolve(__dirname + "/../uploads")
+
 	# Filestore health check
 	# ----------------------
 	# Project and file details to check in persistor when calling /health_check