diff --git a/roles/graphite/grafana/files/grafana.service b/roles/graphite/grafana/files/grafana.service
new file mode 100644
index 0000000000..1585b5e3f1
--- /dev/null
+++ b/roles/graphite/grafana/files/grafana.service
@@ -0,0 +1,23 @@
+[Unit]
+Description=Starts and stops a single grafana instance on this system
+Documentation=http://docs.grafana.org
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+EnvironmentFile=/etc/sysconfig/grafana-server
+User=grafana
+Group=grafana
+Type=simple
+WorkingDirectory=/usr/share/grafana
+ExecStart=/usr/sbin/grafana-server                                \
+                            --config=${CONF_FILE}                 \
+                            cfg:default.paths.logs=${LOG_DIR}     \
+                            cfg:default.paths.data=${DATA_DIR}    \
+LimitNOFILE=10000
+TimeoutStopSec=20
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/roles/graphite/grafana/handlers/main.yml b/roles/graphite/grafana/handlers/main.yml
new file mode 100644
index 0000000000..02db29495f
--- /dev/null
+++ b/roles/graphite/grafana/handlers/main.yml
@@ -0,0 +1,3 @@
+---
+- name: restart grafana
+  service: name=grafana-server state=restarted
diff --git a/roles/graphite/grafana/tasks/main.yml b/roles/graphite/grafana/tasks/main.yml
index 5c20596cf4..c05db77311 100644
--- a/roles/graphite/grafana/tasks/main.yml
+++ b/roles/graphite/grafana/tasks/main.yml
@@ -35,3 +35,14 @@
   - restart apache
   tags:
   - grafana
+  - config
+
+- name: Install custom systemd service file
+  copy: >
+    src=grafana.service
+    dest=/usr/lib/systemd/system/grafana.service
+  tags:
+  - config
+  - grafana
+  notify:
+  - restart grafana