diff --git a/grafana/files/default b/grafana/files/default
index 39c2334..0eb79e1 100644
--- a/grafana/files/default
+++ b/grafana/files/default
@@ -19,4 +19,5 @@
 
 PLUGINS_DIR={{ server.path.data }}/plugins
 
-PID_FILE={{ server.path.pidfile }}
+# Only used on systemd systems
+PID_FILE_DIR={{ server.path.pid_file_dir }}
diff --git a/grafana/map.jinja b/grafana/map.jinja
index 6e4b0bf..c7c4bd4 100644
--- a/grafana/map.jinja
+++ b/grafana/map.jinja
@@ -10,7 +10,7 @@
     home: /usr/share/grafana
     data: /var/lib/grafana
     logs: /var/log/grafana
-    pidfile: /var/run/grafana-server.pid
+    pid_file_dir: /var/run/grafana
   bind:
     address: 0.0.0.0
     port: 3000