diff --git a/pillar/docker/config.sls b/pillar/docker/config.sls
index 08273651f..83fd76541 100644
--- a/pillar/docker/config.sls
+++ b/pillar/docker/config.sls
@@ -1,18 +1,18 @@
-{%- set FLEETMASTER = salt['pillar.get']('static:fleet_master', False) -%}
-{%- set FLEETNODE = salt['pillar.get']('static:fleet_node', False) -%}
-{% set WAZUH = salt['pillar.get']('master:wazuh', '0') %}
-{% set THEHIVE = salt['pillar.get']('master:thehive', '0') %}
-{% set PLAYBOOK = salt['pillar.get']('master:playbook', '0') %}
-{% set FREQSERVER = salt['pillar.get']('master:freq', '0') %}
-{% set DOMAINSTATS = salt['pillar.get']('master:domainstats', '0') %}
+{% set FLEETMASTER = salt['pillar.get']('static:fleet_master', False) %}
+{% set FLEETNODE = salt['pillar.get']('static:fleet_node', False) %}
+{% set WAZUH = salt['pillar.get']('master:wazuh', False) %}
+{% set THEHIVE = salt['pillar.get']('master:thehive', False) %}
+{% set PLAYBOOK = salt['pillar.get']('master:playbook', False) %}
+{% set FREQSERVER = salt['pillar.get']('master:freq', False) %}
+{% set DOMAINSTATS = salt['pillar.get']('master:domainstats', False) %}
 {% set BROVER = salt['pillar.get']('static:broversion', 'COMMUNITY') %}
-{% set GRAFANA = salt['pillar.get']('master:grafana', '0') %}
+{% set GRAFANA = salt['pillar.get']('master:grafana', False) %}
 
 eval:
   containers:
     - so-core
     - so-telegraf
-    {% if  GRAFANA == '1' %}
+    {% if  GRAFANA %}
     - so-influxdb
     - so-grafana
     {% endif %}
@@ -32,23 +32,23 @@ eval:
     - so-zeek
     - so-curator
     - so-elastalert
-    {% if WAZUH != '0' %}
+    {% if WAZUH %}
     - so-wazuh
     {% endif %}
     - so-soctopus
-    {% if THEHIVE != '0' %}
+    {% if THEHIVE %}
     - so-thehive
     - so-thehive-es
     - so-cortex
     {% endif %}
-    {% if PLAYBOOK != '0' %}
+    {% if PLAYBOOK %}
     - so-playbook
     - so-navigator
     {% endif %}
-    {% if FREQSERVER != '0' %}
+    {% if FREQSERVER %}
     - so-freqserver
     {% endif %}
-    {% if DOMAINSTATS != '0' %}
+    {% if DOMAINSTATS %}
     - so-domainstats
     {% endif %}
 heavy_node:
@@ -104,23 +104,23 @@ master_search:
     - so-fleet
     - so-redis
     {% endif %}
-    {% if WAZUH != '0' %}
+    {% if WAZUH %}
     - so-wazuh
     {% endif %}
     - so-soctopus
-    {% if THEHIVE != '0' %}
+    {% if THEHIVE %}
     - so-thehive
     - so-thehive-es
     - so-cortex
     {% endif %}
-    {% if PLAYBOOK != '0' %}
+    {% if PLAYBOOK %}
     - so-playbook
     - so-navigator
     {% endif %}
-    {% if FREQSERVER != '0' %}
+    {% if FREQSERVER %}
     - so-freqserver
     {% endif %}
-    {% if DOMAINSTATS != '0' %}
+    {% if DOMAINSTATS %}
     - so-domainstats
     {% endif %}
 master:
@@ -128,7 +128,7 @@ master:
     - so-dockerregistry
     - so-core
     - so-telegraf
-    {% if  GRAFANA == '1' %}
+    {% if  GRAFANA %}
     - so-influxdb
     - so-grafana
     {% endif %}
@@ -147,23 +147,23 @@ master:
     - so-fleet
     - so-redis
     {% endif %}
-    {% if WAZUH != '0' %}
+    {% if WAZUH %}
     - so-wazuh
     {% endif %}
     - so-soctopus
-    {% if THEHIVE != '0' %}
+    {% if THEHIVE %}
     - so-thehive
     - so-thehive-es
     - so-cortex
     {% endif %}
-    {% if PLAYBOOK != '0' %}
+    {% if PLAYBOOK %}
     - so-playbook
     - so-navigator
     {% endif %}
-    {% if FREQSERVER != '0' %}
+    {% if FREQSERVER %}
     - so-freqserver
     {% endif %}
-    {% if DOMAINSTATS != '0' %}
+    {% if DOMAINSTATS %}
     - so-domainstats
     {% endif %}
 parser_node:
@@ -179,7 +179,7 @@ search_node:
     - so-elasticsearch
     - so-curator
     - so-filebeat
-    {% if WAZUH != '0' %}
+    {% if WAZUH %}
     - so-wazuh
     {% endif %}
 sensor: