diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls
index 07af6bbeb..1a85a081d 100644
--- a/salt/logstash/init.sls
+++ b/salt/logstash/init.sls
@@ -17,7 +17,7 @@
 {% set MANAGER = salt['grains.get']('master') %}
 {% set FEATURES = salt['pillar.get']('elastic:features', False) %}
 
-{% if FEATURES %}
+{%- if FEATURES is sameas true %}
   {% set FEATURES = "-features" %}
 {% else %}
   {% set FEATURES = '' %}
diff --git a/salt/logstash/pipelines/config/so/9000_output_zeek.conf.jinja b/salt/logstash/pipelines/config/so/9000_output_zeek.conf.jinja
index f9dbcccfa..e075918f6 100644
--- a/salt/logstash/pipelines/config/so/9000_output_zeek.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9000_output_zeek.conf.jinja
@@ -8,7 +8,7 @@ output {
   if [module] =~ "zeek" and "import" not in [tags] {
     elasticsearch {
       pipeline => "%{module}.%{dataset}"
-      {%- if FEATURES %}
+      {%- if FEATURES is sameas true %}
       hosts => "https://{{ ES }}"
       cacert => '/ca/ca.crt'
       {%- else %}
diff --git a/salt/logstash/pipelines/config/so/9002_output_import.conf.jinja b/salt/logstash/pipelines/config/so/9002_output_import.conf.jinja
index 5be2c2640..ae0a619fe 100644
--- a/salt/logstash/pipelines/config/so/9002_output_import.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9002_output_import.conf.jinja
@@ -8,7 +8,7 @@ output {
   if "import" in [tags] {
     elasticsearch {
       pipeline => "%{module}.%{dataset}"
-      {%- if FEATURES %}
+      {%- if FEATURES is sameas true %}
       hosts => "https://{{ ES }}"
       cacert => '/ca/ca.crt'
       {%- else %}
diff --git a/salt/logstash/pipelines/config/so/9004_output_flow.conf.jinja b/salt/logstash/pipelines/config/so/9004_output_flow.conf.jinja
index f71cf5d52..c888a9752 100644
--- a/salt/logstash/pipelines/config/so/9004_output_flow.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9004_output_flow.conf.jinja
@@ -7,7 +7,7 @@
 output {
   if [event_type] == "sflow" {
     elasticsearch {
-      {%- if FEATURES %}
+      {%- if FEATURES is sameas true %}
       hosts => "https://{{ ES }}"
       cacert => '/ca/ca.crt'
       {%- else %}
diff --git a/salt/logstash/pipelines/config/so/9033_output_snort.conf.jinja b/salt/logstash/pipelines/config/so/9033_output_snort.conf.jinja
index f7a29415a..daddd4b0a 100644
--- a/salt/logstash/pipelines/config/so/9033_output_snort.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9033_output_snort.conf.jinja
@@ -7,7 +7,7 @@
 output {
   if [event_type] == "ids" and "import" not in [tags] {
     elasticsearch {
-      {%- if FEATURES %}
+      {%- if FEATURES is sameas true %}
       hosts => "https://{{ ES }}"
       cacert => '/ca/ca.crt'
       {%- else %}
diff --git a/salt/logstash/pipelines/config/so/9034_output_syslog.conf.jinja b/salt/logstash/pipelines/config/so/9034_output_syslog.conf.jinja
index 403ba1f2e..d554adf16 100644
--- a/salt/logstash/pipelines/config/so/9034_output_syslog.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9034_output_syslog.conf.jinja
@@ -8,7 +8,7 @@ output {
   if [module] =~ "syslog" {
     elasticsearch {
       pipeline => "%{module}"
-      {%- if FEATURES %}
+      {%- if FEATURES is sameas true %}
       hosts => "https://{{ ES }}"
       cacert => '/ca/ca.crt'
       {%- else %}
diff --git a/salt/logstash/pipelines/config/so/9100_output_osquery.conf.jinja b/salt/logstash/pipelines/config/so/9100_output_osquery.conf.jinja
index a8c8910d9..c1e6ae59f 100644
--- a/salt/logstash/pipelines/config/so/9100_output_osquery.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9100_output_osquery.conf.jinja
@@ -8,7 +8,7 @@ output {
   if [module] =~ "osquery" {
     elasticsearch {
       pipeline => "%{module}.%{dataset}" 
-      {%- if FEATURES %}
+      {%- if FEATURES is sameas true %}
       hosts => "https://{{ ES }}"
       cacert => '/ca/ca.crt'
       {%- else %}
diff --git a/salt/logstash/pipelines/config/so/9200_output_firewall.conf.jinja b/salt/logstash/pipelines/config/so/9200_output_firewall.conf.jinja
index 8f006c90e..14e741b9d 100644
--- a/salt/logstash/pipelines/config/so/9200_output_firewall.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9200_output_firewall.conf.jinja
@@ -7,7 +7,7 @@
 output {
   if "firewall" in [tags] {
     elasticsearch {
-      {%- if FEATURES %}
+      {%- if FEATURES is sameas true %}
       hosts => "https://{{ ES }}"
       cacert => '/ca/ca.crt'
       {%- else %}
diff --git a/salt/logstash/pipelines/config/so/9400_output_suricata.conf.jinja b/salt/logstash/pipelines/config/so/9400_output_suricata.conf.jinja
index 35f9f35b4..a684e2412 100644
--- a/salt/logstash/pipelines/config/so/9400_output_suricata.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9400_output_suricata.conf.jinja
@@ -8,7 +8,7 @@ output {
   if [module] =~ "suricata" and "import" not in [tags] {
     elasticsearch {
       pipeline => "%{module}.%{dataset}"
-      {%- if FEATURES %}
+      {%- if FEATURES is sameas true %}
       hosts => "https://{{ ES }}"
       cacert => '/ca/ca.crt'
       {%- else %}
diff --git a/salt/logstash/pipelines/config/so/9500_output_beats.conf.jinja b/salt/logstash/pipelines/config/so/9500_output_beats.conf.jinja
index e923e5044..321566bac 100644
--- a/salt/logstash/pipelines/config/so/9500_output_beats.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9500_output_beats.conf.jinja
@@ -8,7 +8,7 @@ output {
   if "beat-ext" in [tags] and "import" not in [tags] {
     elasticsearch {
       pipeline => "beats.common" 
-      {%- if FEATURES %}
+      {%- if FEATURES is sameas true %}
       hosts => "https://{{ ES }}"
       cacert => '/ca/ca.crt'
       {%- else %}
diff --git a/salt/logstash/pipelines/config/so/9600_output_ossec.conf.jinja b/salt/logstash/pipelines/config/so/9600_output_ossec.conf.jinja
index 080c8e4e1..4af0839c4 100644
--- a/salt/logstash/pipelines/config/so/9600_output_ossec.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9600_output_ossec.conf.jinja
@@ -8,7 +8,7 @@ output {
   if [module] =~ "ossec" {
     elasticsearch {
       pipeline => "%{module}.%{dataset}"
-      {%- if FEATURES %}
+      {%- if FEATURES is sameas true %}
       hosts => "https://{{ ES }}"
       cacert => '/ca/ca.crt'
       {%- else %}
diff --git a/salt/logstash/pipelines/config/so/9700_output_strelka.conf.jinja b/salt/logstash/pipelines/config/so/9700_output_strelka.conf.jinja
index 8e5230af6..a0e9950de 100644
--- a/salt/logstash/pipelines/config/so/9700_output_strelka.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9700_output_strelka.conf.jinja
@@ -8,7 +8,7 @@ output {
   if [module] =~ "strelka" {
     elasticsearch {
       pipeline => "%{module}.%{dataset}" 
-      {%- if FEATURES %}
+      {%- if FEATURES is sameas true %}
       hosts => "https://{{ ES }}"
       cacert => '/ca/ca.crt'
       {%- else %}