diff --git a/salt/elasticsearch/files/elasticsearch.yml b/salt/elasticsearch/files/elasticsearch.yml
index ac27fb9b5..a38c3db87 100644
--- a/salt/elasticsearch/files/elasticsearch.yml
+++ b/salt/elasticsearch/files/elasticsearch.yml
@@ -1,5 +1,5 @@
 {%- set NODE_ROUTE_TYPE = salt['pillar.get']('elasticsearch:node_route_type', 'hot') %}
-{%- if salt['pillar.get']('elasticsearch:hot_warm_enabled') or salt['pillar.get']('elasticsearch:true_cluster')}
+{%- if salt['pillar.get']('elasticsearch:hot_warm_enabled') or salt['pillar.get']('elasticsearch:true_cluster') %}
 {%- set ESCLUSTERNAME = salt['pillar.get']('elasticsearch:true_cluster_name', '') %}
 {%- else %}
 {%- set ESCLUSTERNAME = salt['pillar.get']('elasticsearch:esclustername', '') %}
@@ -23,4 +23,4 @@ cluster.routing.allocation.disk.watermark.low: 95%
 cluster.routing.allocation.disk.watermark.high: 98%
 cluster.routing.allocation.disk.watermark.flood_stage: 98%
 node.attr.box_type: {{ NODE_ROUTE_TYPE }}
-node.name: {{ esclustername }}
+node.name: {{ ESCLUSTERNAME }}
diff --git a/salt/logstash/pipelines/templates/so/so-beats-template.json b/salt/logstash/pipelines/templates/so/so-beats-template.json.jinja
similarity index 100%
rename from salt/logstash/pipelines/templates/so/so-beats-template.json
rename to salt/logstash/pipelines/templates/so/so-beats-template.json.jinja
diff --git a/salt/logstash/pipelines/templates/so/so-firewall-template.json b/salt/logstash/pipelines/templates/so/so-firewall-template.json.jinja
similarity index 100%
rename from salt/logstash/pipelines/templates/so/so-firewall-template.json
rename to salt/logstash/pipelines/templates/so/so-firewall-template.json.jinja
diff --git a/salt/logstash/pipelines/templates/so/so-ids-template.json b/salt/logstash/pipelines/templates/so/so-ids-template.json.jinja
similarity index 100%
rename from salt/logstash/pipelines/templates/so/so-ids-template.json
rename to salt/logstash/pipelines/templates/so/so-ids-template.json.jinja
diff --git a/salt/logstash/pipelines/templates/so/so-import-template.json b/salt/logstash/pipelines/templates/so/so-import-template.json.jinja
similarity index 100%
rename from salt/logstash/pipelines/templates/so/so-import-template.json
rename to salt/logstash/pipelines/templates/so/so-import-template.json.jinja