diff --git a/grafana/files/default b/grafana/files/default
index 916b011..39c2334 100644
--- a/grafana/files/default
+++ b/grafana/files/default
@@ -18,3 +18,5 @@
 RESTART_ON_UPGRADE=true
 
 PLUGINS_DIR={{ server.path.data }}/plugins
+
+PID_FILE={{ server.path.pidfile }}
diff --git a/grafana/map.jinja b/grafana/map.jinja
index 18958ae..6e4b0bf 100644
--- a/grafana/map.jinja
+++ b/grafana/map.jinja
@@ -10,6 +10,7 @@
     home: /usr/share/grafana
     data: /var/lib/grafana
     logs: /var/log/grafana
+    pidfile: /var/run/grafana-server.pid
   bind:
     address: 0.0.0.0
     port: 3000