diff --git a/salt/common/init.sls b/salt/common/init.sls
index 00d7f35d0..74735a185 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:
@@ -187,7 +188,7 @@ so-telegraf:
       - /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' %}
+{% if grains['role'] == 'so-master' or grains['role'] == 'so-eval' and GRAFANA == 1 %}
 
 # Influx DB
 influxconfdir:
diff --git a/salt/top.sls b/salt/top.sls
index 0d6476779..b36f3b4c9 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -33,10 +33,10 @@ base:
     - curator
     - elastalert
     - redis
-    {%- if OSQUERY != '0' %}
+    {%- if OSQUERY != 0 %}
     - fleet
     {%- endif %}
-    {%- if WAZUH != '0' %}
+    {%- if WAZUH != 0 %}
     - wazuh
     {%- endif %}
     - filebeat