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 e075918f6..98a842b2d 100644
--- a/salt/logstash/pipelines/config/so/9000_output_zeek.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9000_output_zeek.conf.jinja
@@ -8,12 +8,7 @@ output {
   if [module] =~ "zeek" and "import" not in [tags] {
     elasticsearch {
       pipeline => "%{module}.%{dataset}"
-      {%- if FEATURES is sameas true %}
-      hosts => "https://{{ ES }}"
-      cacert => '/ca/ca.crt'
-      {%- else %}
       hosts => "{{ ES }}"
-      {%- endif %}
       index => "so-zeek-%{+YYYY.MM.dd}"
       template_name => "so-zeek"
       template => "/templates/so-zeek-template.json"
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 ae0a619fe..315c892e2 100644
--- a/salt/logstash/pipelines/config/so/9002_output_import.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9002_output_import.conf.jinja
@@ -8,12 +8,7 @@ output {
   if "import" in [tags] {
     elasticsearch {
       pipeline => "%{module}.%{dataset}"
-      {%- if FEATURES is sameas true %}
-      hosts => "https://{{ ES }}"
-      cacert => '/ca/ca.crt'
-      {%- else %}
       hosts => "{{ ES }}"
-      {%- endif %}
       index => "so-import-%{+YYYY.MM.dd}"
       template_name => "so-import"
       template => "/templates/so-import-template.json"
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 c888a9752..889a3567f 100644
--- a/salt/logstash/pipelines/config/so/9004_output_flow.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9004_output_flow.conf.jinja
@@ -7,12 +7,7 @@
 output {
   if [event_type] == "sflow" {
     elasticsearch {
-      {%- if FEATURES is sameas true %}
-      hosts => "https://{{ ES }}"
-      cacert => '/ca/ca.crt'
-      {%- else %}
       hosts => "{{ ES }}"
-      {%- endif %}
       index => "so-flow-%{+YYYY.MM.dd}"
       template_name => "so-flow"
       template => "/templates/so-flow-template.json"
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 daddd4b0a..96d2ae5ba 100644
--- a/salt/logstash/pipelines/config/so/9033_output_snort.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9033_output_snort.conf.jinja
@@ -7,12 +7,7 @@
 output {
   if [event_type] == "ids" and "import" not in [tags] {
     elasticsearch {
-      {%- if FEATURES is sameas true %}
-      hosts => "https://{{ ES }}"
-      cacert => '/ca/ca.crt'
-      {%- else %}
       hosts => "{{ ES }}"
-      {%- endif %}
       index => "so-ids-%{+YYYY.MM.dd}"
       template_name => "so-ids"
       template => "/templates/so-ids-template.json"
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 d554adf16..ee5c57c5a 100644
--- a/salt/logstash/pipelines/config/so/9034_output_syslog.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9034_output_syslog.conf.jinja
@@ -8,12 +8,7 @@ output {
   if [module] =~ "syslog" {
     elasticsearch {
       pipeline => "%{module}"
-      {%- if FEATURES is sameas true %}
-      hosts => "https://{{ ES }}"
-      cacert => '/ca/ca.crt'
-      {%- else %}
       hosts => "{{ ES }}"
-      {%- endif %}
       index => "so-syslog-%{+YYYY.MM.dd}"
       template_name => "so-syslog"
       template => "/templates/so-syslog-template.json"
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 c1e6ae59f..a9e5ac64d 100644
--- a/salt/logstash/pipelines/config/so/9100_output_osquery.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9100_output_osquery.conf.jinja
@@ -8,12 +8,7 @@ output {
   if [module] =~ "osquery" {
     elasticsearch {
       pipeline => "%{module}.%{dataset}" 
-      {%- if FEATURES is sameas true %}
-      hosts => "https://{{ ES }}"
-      cacert => '/ca/ca.crt'
-      {%- else %}
       hosts => "{{ ES }}"
-      {%- endif %}
       index => "so-osquery-%{+YYYY.MM.dd}"
       template_name => "so-osquery"
       template => "/templates/so-osquery-template.json"
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 14e741b9d..f8aa07b1b 100644
--- a/salt/logstash/pipelines/config/so/9200_output_firewall.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9200_output_firewall.conf.jinja
@@ -7,12 +7,7 @@
 output {
   if "firewall" in [tags] {
     elasticsearch {
-      {%- if FEATURES is sameas true %}
-      hosts => "https://{{ ES }}"
-      cacert => '/ca/ca.crt'
-      {%- else %}
       hosts => "{{ ES }}"
-      {%- endif %}
       index => "so-firewall-%{+YYYY.MM.dd}"
       template_name => "so-firewall"
       template => "/templates/so-firewall-template.json"
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 a684e2412..e65952cca 100644
--- a/salt/logstash/pipelines/config/so/9400_output_suricata.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9400_output_suricata.conf.jinja
@@ -8,12 +8,7 @@ output {
   if [module] =~ "suricata" and "import" not in [tags] {
     elasticsearch {
       pipeline => "%{module}.%{dataset}"
-      {%- if FEATURES is sameas true %}
-      hosts => "https://{{ ES }}"
-      cacert => '/ca/ca.crt'
-      {%- else %}
       hosts => "{{ ES }}"
-      {%- endif %}
       index => "so-ids-%{+YYYY.MM.dd}"
       template_name => "so-ids" 
       template => "/templates/so-ids-template.json"
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 321566bac..10700733e 100644
--- a/salt/logstash/pipelines/config/so/9500_output_beats.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9500_output_beats.conf.jinja
@@ -8,12 +8,7 @@ output {
   if "beat-ext" in [tags] and "import" not in [tags] {
     elasticsearch {
       pipeline => "beats.common" 
-      {%- if FEATURES is sameas true %}
-      hosts => "https://{{ ES }}"
-      cacert => '/ca/ca.crt'
-      {%- else %}
       hosts => "{{ ES }}"
-      {%- endif %}
       index => "so-beats-%{+YYYY.MM.dd}"
       template_name => "so-beats"
       template => "/templates/so-beats-template.json"
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 4af0839c4..89d1a9466 100644
--- a/salt/logstash/pipelines/config/so/9600_output_ossec.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9600_output_ossec.conf.jinja
@@ -8,12 +8,7 @@ output {
   if [module] =~ "ossec" {
     elasticsearch {
       pipeline => "%{module}.%{dataset}"
-      {%- if FEATURES is sameas true %}
-      hosts => "https://{{ ES }}"
-      cacert => '/ca/ca.crt'
-      {%- else %}
       hosts => "{{ ES }}"
-      {%- endif %}
       index => "so-ossec-%{+YYYY.MM.dd}"
       template_name => "so-ossec"
       template => "/templates/so-ossec-template.json"
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 a0e9950de..cdc340b39 100644
--- a/salt/logstash/pipelines/config/so/9700_output_strelka.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9700_output_strelka.conf.jinja
@@ -8,12 +8,7 @@ output {
   if [module] =~ "strelka" {
     elasticsearch {
       pipeline => "%{module}.%{dataset}" 
-      {%- if FEATURES is sameas true %}
-      hosts => "https://{{ ES }}"
-      cacert => '/ca/ca.crt'
-      {%- else %}
       hosts => "{{ ES }}"
-      {%- endif %}
       index => "so-strelka-%{+YYYY.MM.dd}"
       template_name => "so-strelka"
       template => "/templates/so-strelka-template.json"