diff --git a/server-ce/Dockerfile b/server-ce/Dockerfile
index 929528f274..eac17b83c1 100644
--- a/server-ce/Dockerfile
+++ b/server-ce/Dockerfile
@@ -25,11 +25,11 @@ RUN npm install -g grunt-cli
 # Set up sharelatex user and home directory
 RUN adduser --system --group --home /var/www/sharelatex --no-create-home sharelatex; \
 	mkdir -p /var/lib/sharelatex; \
-	chown sharelatex:sharelatex /var/lib/sharelatex; \
+	chown www-data:www-data /var/lib/sharelatex; \
 	mkdir -p /var/log/sharelatex; \
-	chown sharelatex:sharelatex /var/log/sharelatex; \
+	chown www-data:www-data /var/log/sharelatex; \
 	mkdir -p /var/lib/sharelatex/data/template_files; \
-	chown sharelatex:sharelatex /var/lib/sharelatex/data/template_files;
+	chown www-data:www-data /var/lib/sharelatex/data/template_files;
 
 
 # Install ShareLaTeX
diff --git a/server-ce/runit/chat-sharelatex.sh b/server-ce/runit/chat-sharelatex.sh
index 509ff8588e..1b8533bb86 100755
--- a/server-ce/runit/chat-sharelatex.sh
+++ b/server-ce/runit/chat-sharelatex.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 export SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee
-exec /sbin/setuser sharelatex /usr/bin/node /var/www/sharelatex/chat/app.js >> /var/log/sharelatex/chat.log 2>&1
\ No newline at end of file
+exec /sbin/setuser www-data /usr/bin/node /var/www/sharelatex/chat/app.js >> /var/log/sharelatex/chat.log 2>&1
\ No newline at end of file
diff --git a/server-ce/runit/clsi-sharelatex.sh b/server-ce/runit/clsi-sharelatex.sh
index 59298743c8..1c6974cd2a 100755
--- a/server-ce/runit/clsi-sharelatex.sh
+++ b/server-ce/runit/clsi-sharelatex.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 export SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee
-exec /sbin/setuser sharelatex /usr/bin/node /var/www/sharelatex/clsi/app.js >> /var/log/sharelatex/clsi.log 2>&1
\ No newline at end of file
+exec /sbin/setuser www-data /usr/bin/node /var/www/sharelatex/clsi/app.js >> /var/log/sharelatex/clsi.log 2>&1
\ No newline at end of file
diff --git a/server-ce/runit/docstore-sharelatex.sh b/server-ce/runit/docstore-sharelatex.sh
index ba7a96c8d7..0de82ccf20 100755
--- a/server-ce/runit/docstore-sharelatex.sh
+++ b/server-ce/runit/docstore-sharelatex.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 export SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee
-exec /sbin/setuser sharelatex /usr/bin/node /var/www/sharelatex/docstore/app.js >> /var/log/sharelatex/docstore.log 2>&1
\ No newline at end of file
+exec /sbin/setuser www-data /usr/bin/node /var/www/sharelatex/docstore/app.js >> /var/log/sharelatex/docstore.log 2>&1
\ No newline at end of file
diff --git a/server-ce/runit/document-updater-sharelatex.sh b/server-ce/runit/document-updater-sharelatex.sh
index 8f692ecdbe..274b7f9998 100755
--- a/server-ce/runit/document-updater-sharelatex.sh
+++ b/server-ce/runit/document-updater-sharelatex.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 export SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee
-exec /sbin/setuser sharelatex /usr/bin/node /var/www/sharelatex/document-updater/app.js >> /var/log/sharelatex/document-updater.log 2>&1
\ No newline at end of file
+exec /sbin/setuser www-data /usr/bin/node /var/www/sharelatex/document-updater/app.js >> /var/log/sharelatex/document-updater.log 2>&1
\ No newline at end of file
diff --git a/server-ce/runit/filestore-sharelatex.sh b/server-ce/runit/filestore-sharelatex.sh
index b02695f747..e0858c01ce 100755
--- a/server-ce/runit/filestore-sharelatex.sh
+++ b/server-ce/runit/filestore-sharelatex.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 export SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee
-exec /sbin/setuser sharelatex /usr/bin/node /var/www/sharelatex/filestore/app.js >> /var/log/sharelatex/filestore.log 2>&1
\ No newline at end of file
+exec /sbin/setuser www-data /usr/bin/node /var/www/sharelatex/filestore/app.js >> /var/log/sharelatex/filestore.log 2>&1
\ No newline at end of file
diff --git a/server-ce/runit/real-time-sharelatex.sh b/server-ce/runit/real-time-sharelatex.sh
index 19aaed457b..c57d1d489e 100755
--- a/server-ce/runit/real-time-sharelatex.sh
+++ b/server-ce/runit/real-time-sharelatex.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 export SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee
-exec /sbin/setuser sharelatex /usr/bin/node /var/www/sharelatex/real-time/app.js >> /var/log/sharelatex/real-time.log 2>&1
\ No newline at end of file
+exec /sbin/setuser www-data /usr/bin/node /var/www/sharelatex/real-time/app.js >> /var/log/sharelatex/real-time.log 2>&1
\ No newline at end of file
diff --git a/server-ce/runit/spelling-sharelatex.sh b/server-ce/runit/spelling-sharelatex.sh
index 848c6ac7d1..4466bcfcf5 100755
--- a/server-ce/runit/spelling-sharelatex.sh
+++ b/server-ce/runit/spelling-sharelatex.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 export SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee
-exec /sbin/setuser sharelatex /usr/bin/node /var/www/sharelatex/spelling/app.js >> /var/log/sharelatex/spelling.log 2>&1
\ No newline at end of file
+exec /sbin/setuser www-data /usr/bin/node /var/www/sharelatex/spelling/app.js >> /var/log/sharelatex/spelling.log 2>&1
\ No newline at end of file
diff --git a/server-ce/runit/tags-sharelatex.sh b/server-ce/runit/tags-sharelatex.sh
index 8616c1356c..a5630ed4ff 100755
--- a/server-ce/runit/tags-sharelatex.sh
+++ b/server-ce/runit/tags-sharelatex.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 export SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee
-exec /sbin/setuser sharelatex /usr/bin/node /var/www/sharelatex/tags/app.js >> /var/log/sharelatex/tags.log 2>&1
\ No newline at end of file
+exec /sbin/setuser www-data /usr/bin/node /var/www/sharelatex/tags/app.js >> /var/log/sharelatex/tags.log 2>&1
\ No newline at end of file
diff --git a/server-ce/runit/track-changes-sharelatex.sh b/server-ce/runit/track-changes-sharelatex.sh
index 347d8f021a..aeb812ef38 100755
--- a/server-ce/runit/track-changes-sharelatex.sh
+++ b/server-ce/runit/track-changes-sharelatex.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 export SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee
-exec /sbin/setuser sharelatex /usr/bin/node /var/www/sharelatex/track-changes/app.js >> /var/log/sharelatex/track-changes.log 2>&1
\ No newline at end of file
+exec /sbin/setuser www-data /usr/bin/node /var/www/sharelatex/track-changes/app.js >> /var/log/sharelatex/track-changes.log 2>&1
\ No newline at end of file
diff --git a/server-ce/runit/web-sharelatex.sh b/server-ce/runit/web-sharelatex.sh
index b0bda54c81..053a55a326 100755
--- a/server-ce/runit/web-sharelatex.sh
+++ b/server-ce/runit/web-sharelatex.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 export SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee
-exec /sbin/setuser sharelatex /usr/bin/node /var/www/sharelatex/web/app.js >> /var/log/sharelatex/web.log 2>&1
\ No newline at end of file
+exec /sbin/setuser www-data /usr/bin/node /var/www/sharelatex/web/app.js >> /var/log/sharelatex/web.log 2>&1
\ No newline at end of file