diff --git a/packaging/deb/systemd/grafana-server.service b/packaging/deb/systemd/grafana-server.service
index 7f5b1427252..f99c96fcb13 100644
--- a/packaging/deb/systemd/grafana-server.service
+++ b/packaging/deb/systemd/grafana-server.service
@@ -5,13 +5,14 @@ Wants=network-online.target
 After=network-online.target
 
 [Service]
-EnvironmentFile=/etc/default/grafana
+EnvironmentFile=/etc/default/grafana-server
 User=grafana
 Group=grafana
 Type=simple
+WorkingDirectory=/usr/share/grafana
 ExecStart=/usr/sbin/grafana-server                                \
                             --config=${CONF_FILE}                 \
-                            cfg:default.paths.data=${LOG_DIR}     \
+                            cfg:default.paths.logs=${LOG_DIR}     \
                             cfg:default.paths.data=${DATA_DIR}    \
 LimitNOFILE=10000
 TimeoutStopSec=20