diff --git a/salt/common/init.sls b/salt/common/init.sls
index 3a8d569b9..83ae31a9d 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -1,3 +1,4 @@
+{%- set GRAFANA = salt['pillar.get']('master:grafana', '0') %}
 # Add socore Group
 socoregroup:
   group.present:
@@ -215,6 +216,9 @@ so-telegraf:
       - /opt/so/conf/telegraf/etc/telegraf.conf
       - /opt/so/conf/telegraf/scripts
 
+# If its a master or eval lets install the back end for now		
+{% if grains['role'] == 'so-master' or grains['role'] == 'so-eval' and GRAFANA == 1 %}
+
 # Influx DB
 influxconfdir:
   file.directory: