diff --git a/conf/systemd.service b/conf/systemd.service
index 200bb15..e419287 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -1,12 +1,13 @@
 [Unit]
 Description=Etherpad-lite: collaborative editor
-After=syslog.target network.target postgresql.service
+After=syslog.target network.target
 
 [Service]
 Type=simple
 User=__APP__
 Group=__APP__
-WorkingDirectory=__INSTALL_DIR__
+WorkingDirectory=__INSTALL_DIR__/
+Environment=ETHERPAD_PRODUCTION=true
 Environment="NODE_ENV=production"
 Environment="__YNH_NODE_LOAD_PATH__"
 ExecStart=__INSTALL_DIR__/src/bin/run.sh