diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml
index 2486c96..c781d0b 100644
--- a/roles/grafana/tasks/main.yml
+++ b/roles/grafana/tasks/main.yml
@@ -42,9 +42,17 @@
   tags:
   - nginx-config
 
-- meta: flush_handlers
 
+- name: ensure grafana starts at boot
+  service:
+    name: grafana-server
+    enabled: true
+  tags:
+  - service
+- meta: flush_handlers
 - name: ensure grafana is running
   service:
     name: grafana-server
     state: started
+  tags:
+  - service