diff --git a/init_scripts/00_make_sharelatex_data_dirs.sh b/init_scripts/00_make_sharelatex_data_dirs.sh
index f8d424f201..f48a95fde7 100755
--- a/init_scripts/00_make_sharelatex_data_dirs.sh
+++ b/init_scripts/00_make_sharelatex_data_dirs.sh
@@ -1,21 +1,24 @@
 #!/bin/sh
 mkdir -p /var/lib/sharelatex/data
-chown sharelatex:sharelatex /var/lib/sharelatex/data
+chown www-data:www-data /var/lib/sharelatex/data
 
 mkdir -p /var/lib/sharelatex/data/user_files
-chown sharelatex:sharelatex /var/lib/sharelatex/data/user_files
+chown www-data:www-data /var/lib/sharelatex/data/user_files
 
 mkdir -p /var/lib/sharelatex/data/compiles
-chown sharelatex:sharelatex /var/lib/sharelatex/data/compiles
+chown www-data:www-data /var/lib/sharelatex/data/compiles
 
 mkdir -p /var/lib/sharelatex/data/cache
-chown sharelatex:sharelatex /var/lib/sharelatex/data/cache
+chown www-data:www-data /var/lib/sharelatex/data/cache
 
 mkdir -p /var/lib/sharelatex/tmp
-chown sharelatex:sharelatex /var/lib/sharelatex/tmp
+chown www-data:www-data /var/lib/sharelatex/tmp
 
 mkdir -p /var/lib/sharelatex/tmp/uploads
-chown sharelatex:sharelatex /var/lib/sharelatex/tmp/uploads
+chown www-data:www-data /var/lib/sharelatex/tmp/uploads
 
 mkdir -p /var/lib/sharelatex/tmp/dumpFolder
-chown sharelatex:sharelatex /var/lib/sharelatex/tmp/dumpFolder
\ No newline at end of file
+chown www-data:www-data /var/lib/sharelatex/tmp/dumpFolder
+
+
+chown www-data:www-data /var/lib/sharelatex/data/db.sqlite
\ No newline at end of file
diff --git a/settings.coffee b/settings.coffee
index f3066da8ed..f6d48b3dc4 100644
--- a/settings.coffee
+++ b/settings.coffee
@@ -497,7 +497,7 @@ if process.env["DOCKER_IN_DOCKER"] == "true"
 			image: process.env["TEX_LIVE_DOCKER_IMAGE"]
 			env:
 				PATH: process.env["COMPILER_PATH"] or "/usr/local/texlive/2015/bin/x86_64-linux:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-			user: "tex"
+			user: "www-data"
 
 
 # Templates