diff --git a/elk_metrics_6x/templates/_include_setup_dashboards.yml.j2 b/elk_metrics_6x/templates/_include_setup_dashboards.yml.j2
new file mode 100644
index 00000000..87e8b400
--- /dev/null
+++ b/elk_metrics_6x/templates/_include_setup_dashboards.yml.j2
@@ -0,0 +1,32 @@
+# These settings control loading the sample dashboards to the Kibana index. Loading
+# the dashboards are disabled by default and can be enabled either by setting the
+# options here, or by using the `-setup` CLI flag or the `setup` command.
+setup.dashboards.enabled: false
+
+# The directory from where to read the dashboards. The default is the `kibana`
+# folder in the home path.
+#setup.dashboards.directory: ${path.home}/kibana
+
+# The URL from where to download the dashboards archive. It is used instead of
+# the directory if it has a value.
+#setup.dashboards.url:
+
+# The file archive (zip file) from where to read the dashboards. It is used instead
+# of the directory when it has a value.
+#setup.dashboards.file:
+
+# In case the archive contains the dashboards from multiple Beats, this lets you
+# select which one to load. You can load all the dashboards in the archive by
+# setting this to the empty string.
+#setup.dashboards.beat: {{ beat_name }}
+
+# The name of the Kibana index to use for setting the configuration. Default is ".kibana"
+#setup.dashboards.kibana_index: .kibana
+
+# The Elasticsearch index name. This overwrites the index name defined in the
+# dashboards and index pattern. Example: testbeat-*
+#setup.dashboards.index:
+
+# Always use the Kibana API for loading the dashboards instead of autodetecting
+# how to install the dashboards by first querying Elasticsearch.
+#setup.dashboards.always_kibana: false
diff --git a/elk_metrics_6x/templates/_include_setup_template.yml.j2 b/elk_metrics_6x/templates/_include_setup_template.yml.j2
index a9b8ec09..2da9661f 100644
--- a/elk_metrics_6x/templates/_include_setup_template.yml.j2
+++ b/elk_metrics_6x/templates/_include_setup_template.yml.j2
@@ -1,3 +1,25 @@
+# A template is used to set the mapping in Elasticsearch
+# By default template loading is enabled and the template is loaded.
+# These settings can be adjusted to load your own template or overwrite existing ones.
+
+# Set to false to disable template loading.
+setup.template.enabled: false
+
+# Template name. By default the template name is "{{ beat_name }}-%{[beat.version]}"
+# The template name and pattern has to be set in case the elasticsearch index pattern is modified.
+setup.template.name: "{{ beat_name }}-%{[beat.version]}"
+
+# Template pattern. By default the template pattern is "-%{[beat.version]}-*" to apply to the default index settings.
+# The first part is the version of the beat and then -* is used to match all daily indices.
+# The template name and pattern has to be set in case the elasticsearch index pattern is modified.
+setup.template.pattern: "{{ beat_name }}-%{[beat.version]}-*"
+
+# Path to fields.yml file to generate the template
+setup.template.fields: "${path.config}/fields.yml"
+
+# Overwrite existing template
+setup.template.overwrite: false
+
 {% set shards = ((data_nodes | length) * 3) | int %}
 
 # Elasticsearch template settings
diff --git a/elk_metrics_6x/templates/apm-server.yml.j2 b/elk_metrics_6x/templates/apm-server.yml.j2
index 5cd45d92..483b42fa 100644
--- a/elk_metrics_6x/templates/apm-server.yml.j2
+++ b/elk_metrics_6x/templates/apm-server.yml.j2
@@ -130,59 +130,14 @@ apm-server:
 #path.logs: ${path.home}/logs
 
 #============================== Dashboards =====================================
-# These settings control loading the sample dashboards to the Kibana index. Loading
-# the dashboards are disabled by default and can be enabled either by setting the
-# options here, or by using the `-setup` CLI flag or the `setup` command.
-setup.dashboards.enabled: true
+{% with beat_name="apm" %}
+{%   include 'templates/_include_setup_dashboards.yml.j2' %}
+{% endwith %}
 
-# The directory from where to read the dashboards. The default is the `kibana`
-# folder in the home path.
-#setup.dashboards.directory: ${path.home}/kibana
-
-# The URL from where to download the dashboards archive. It is used instead of
-# the directory if it has a value.
-#setup.dashboards.url:
-
-# The file archive (zip file) from where to read the dashboards. It is used instead
-# of the directory when it has a value.
-#setup.dashboards.file:
-
-# The name of the Kibana index to use for setting the configuration. Default is ".kibana"
-#setup.dashboards.kibana_index: .kibana
-
-# The Elasticsearch index name. This overwrites the index name defined in the
-# dashboards and index pattern. Example: testbeat-*
-#setup.dashboards.index:
-
-# Always use the Kibana API for loading the dashboards instead of autodetecting
-# how to install the dashboards by first querying Elasticsearch.
-#setup.dashboards.always_kibana: false
-
-#============================== Template =====================================
-
-# A template is used to set the mapping in Elasticsearch
-# By default template loading is enabled and the template is loaded.
-# These settings can be adjusted to load your own template or overwrite existing ones.
-
-# Set to false to disable template loading.
-setup.template.enabled: true
-
-# Template name. By default the template name is "apm-%{[beat.version]}"
-# The template name and pattern has to be set in case the elasticsearch index pattern is modified.
-setup.template.name: "apm-%{[beat.version]}"
-
-# Template pattern. By default the template pattern is "-%{[beat.version]}-*" to apply to the default index settings.
-# The first part is the version of the beat and then -* is used to match all daily indices.
-# The template name and pattern has to be set in case the elasticsearch index pattern is modified.
-setup.template.pattern: "apm-%{[beat.version]}-*"
-
-# Path to fields.yml file to generate the template
-setup.template.fields: "${path.config}/fields.yml"
-
-# Overwrite existing template
-setup.template.overwrite: true
-
-{% include 'templates/_include_setup_template.yml.j2' %}
+#=============================== Template ======================================
+{% with beat_name="apm" %}
+{%   include 'templates/_include_setup_template.yml.j2' %}
+{% endwith %}
 
 #============================== Kibana =====================================
 {% include 'templates/_include_kibana_setup.yml.j2' %}
diff --git a/elk_metrics_6x/templates/auditbeat.yml.j2 b/elk_metrics_6x/templates/auditbeat.yml.j2
index 257d30b9..e8d7002a 100644
--- a/elk_metrics_6x/templates/auditbeat.yml.j2
+++ b/elk_metrics_6x/templates/auditbeat.yml.j2
@@ -656,75 +656,14 @@ auditbeat.modules:
 #path.logs: ${path.home}/logs
 
 #============================== Dashboards =====================================
-# These settings control loading the sample dashboards to the Kibana index. Loading
-# the dashboards are disabled by default and can be enabled either by setting the
-# options here, or by using the `-setup` CLI flag or the `setup` command.
-setup.dashboards.enabled: true
+{% with beat_name="auditbeat" %}
+{%   include 'templates/_include_setup_dashboards.yml.j2' %}
+{% endwith %}
 
-# The directory from where to read the dashboards. The default is the `kibana`
-# folder in the home path.
-#setup.dashboards.directory: ${path.home}/kibana
-
-# The URL from where to download the dashboards archive. It is used instead of
-# the directory if it has a value.
-#setup.dashboards.url:
-
-# The file archive (zip file) from where to read the dashboards. It is used instead
-# of the directory when it has a value.
-#setup.dashboards.file:
-
-# In case the archive contains the dashboards from multiple Beats, this lets you
-# select which one to load. You can load all the dashboards in the archive by
-# setting this to the empty string.
-#setup.dashboards.beat: auditbeat
-
-# The name of the Kibana index to use for setting the configuration. Default is ".kibana"
-#setup.dashboards.kibana_index: .kibana
-
-# The Elasticsearch index name. This overwrites the index name defined in the
-# dashboards and index pattern. Example: testbeat-*
-#setup.dashboards.index:
-
-# Always use the Kibana API for loading the dashboards instead of autodetecting
-# how to install the dashboards by first querying Elasticsearch.
-#setup.dashboards.always_kibana: false
-
-# If true and Kibana is not reachable at the time when dashboards are loaded,
-# it will retry to reconnect to Kibana instead of exiting with an error.
-#setup.dashboards.retry.enabled: false
-
-# Duration interval between Kibana connection retries.
-#setup.dashboards.retry.interval: 1s
-
-# Maximum number of retries before exiting with an error, 0 for unlimited retrying.
-#setup.dashboards.retry.maximum: 0
-
-
-#============================== Template =====================================
-
-# A template is used to set the mapping in Elasticsearch
-# By default template loading is enabled and the template is loaded.
-# These settings can be adjusted to load your own template or overwrite existing ones.
-
-# Set to false to disable template loading.
-setup.template.enabled: true
-
-# Template name. By default the template name is "auditbeat-%{[beat.version]}"
-# The template name and pattern has to be set in case the elasticsearch index pattern is modified.
-setup.template.name: "auditbeat-%{[beat.version]}"
-
-# Template pattern. By default the template pattern is "-%{[beat.version]}-*" to apply to the default index settings.
-# The first part is the version of the beat and then -* is used to match all daily indices.
-# The template name and pattern has to be set in case the elasticsearch index pattern is modified.
-setup.template.pattern: "auditbeat-%{[beat.version]}-*"
-
-# Path to fields.yml file to generate the template
-setup.template.fields: "${path.config}/fields.yml"
-
-# Overwrite existing template
-setup.template.overwrite: true
-
-{% include 'templates/_include_setup_template.yml.j2' %}
+#=============================== Template ======================================
+{% with beat_name="auditbeat" %}
+{%   include 'templates/_include_setup_template.yml.j2' %}
+{% endwith %}
 
 #============================== Kibana =====================================
 {% include 'templates/_include_kibana_setup.yml.j2' %}
diff --git a/elk_metrics_6x/templates/filebeat.yml.j2 b/elk_metrics_6x/templates/filebeat.yml.j2
index 97534c22..927755d8 100644
--- a/elk_metrics_6x/templates/filebeat.yml.j2
+++ b/elk_metrics_6x/templates/filebeat.yml.j2
@@ -1828,64 +1828,14 @@ filebeat.prospectors:
 #path.logs: ${path.home}/logs
 
 #============================== Dashboards =====================================
-# These settings control loading the sample dashboards to the Kibana index. Loading
-# the dashboards are disabled by default and can be enabled either by setting the
-# options here, or by using the `-setup` CLI flag or the `setup` command.
-setup.dashboards.enabled: true
+{% with beat_name="filebeat" %}
+{%   include 'templates/_include_setup_dashboards.yml.j2' %}
+{% endwith %}
 
-# The directory from where to read the dashboards. The default is the `kibana`
-# folder in the home path.
-#setup.dashboards.directory: ${path.home}/kibana
-
-# The URL from where to download the dashboards archive. It is used instead of
-# the directory if it has a value.
-#setup.dashboards.url:
-
-# The file archive (zip file) from where to read the dashboards. It is used instead
-# of the directory when it has a value.
-#setup.dashboards.file:
-
-# In case the archive contains the dashboards from multiple Beats, this lets you
-# select which one to load. You can load all the dashboards in the archive by
-# setting this to the empty string.
-#setup.dashboards.beat: filebeat
-
-# The name of the Kibana index to use for setting the configuration. Default is ".kibana"
-#setup.dashboards.kibana_index: .kibana
-
-# The Elasticsearch index name. This overwrites the index name defined in the
-# dashboards and index pattern. Example: testbeat-*
-#setup.dashboards.index:
-
-# Always use the Kibana API for loading the dashboards instead of autodetecting
-# how to install the dashboards by first querying Elasticsearch.
-#setup.dashboards.always_kibana: false
-
-#============================== Template =====================================
-
-# A template is used to set the mapping in Elasticsearch
-# By default template loading is enabled and the template is loaded.
-# These settings can be adjusted to load your own template or overwrite existing ones.
-
-# Set to false to disable template loading.
-setup.template.enabled: true
-
-# Template name. By default the template name is "filebeat-%{[beat.version]}"
-# The template name and pattern has to be set in case the elasticsearch index pattern is modified.
-setup.template.name: "filebeat-%{[beat.version]}"
-
-# Template pattern. By default the template pattern is "-%{[beat.version]}-*" to apply to the default index settings.
-# The first part is the version of the beat and then -* is used to match all daily indices.
-# The template name and pattern has to be set in case the elasticsearch index pattern is modified.
-setup.template.pattern: "filebeat-%{[beat.version]}-*"
-
-# Path to fields.yml file to generate the template
-setup.template.fields: "${path.config}/fields.yml"
-
-# Overwrite existing template
-setup.template.overwrite: true
-
-{% include 'templates/_include_setup_template.yml.j2' %}
+#=============================== Template ======================================
+{% with beat_name="filebeat" %}
+{%   include 'templates/_include_setup_template.yml.j2' %}
+{% endwith %}
 
 #============================== Kibana =====================================
 {% include 'templates/_include_kibana_setup.yml.j2' %}
diff --git a/elk_metrics_6x/templates/heartbeat.yml.j2 b/elk_metrics_6x/templates/heartbeat.yml.j2
index 83c5c8b2..23c41546 100644
--- a/elk_metrics_6x/templates/heartbeat.yml.j2
+++ b/elk_metrics_6x/templates/heartbeat.yml.j2
@@ -769,64 +769,14 @@ heartbeat.scheduler:
 #path.logs: ${path.home}/logs
 
 #============================== Dashboards =====================================
-# These settings control loading the sample dashboards to the Kibana index. Loading
-# the dashboards are disabled by default and can be enabled either by setting the
-# options here, or by using the `-setup` CLI flag or the `setup` command.
-setup.dashboards.enabled: true
+{% with beat_name="heartbeat" %}
+{%   include 'templates/_include_setup_dashboards.yml.j2' %}
+{% endwith %}
 
-# The directory from where to read the dashboards. The default is the `kibana`
-# folder in the home path.
-#setup.dashboards.directory: ${path.home}/kibana
-
-# The URL from where to download the dashboards archive. It is used instead of
-# the directory if it has a value.
-#setup.dashboards.url:
-
-# The file archive (zip file) from where to read the dashboards. It is used instead
-# of the directory when it has a value.
-#setup.dashboards.file:
-
-# In case the archive contains the dashboards from multiple Beats, this lets you
-# select which one to load. You can load all the dashboards in the archive by
-# setting this to the empty string.
-#setup.dashboards.beat: heartbeat
-
-# The name of the Kibana index to use for setting the configuration. Default is ".kibana"
-#setup.dashboards.kibana_index: .kibana
-
-# The Elasticsearch index name. This overwrites the index name defined in the
-# dashboards and index pattern. Example: testbeat-*
-#setup.dashboards.index:
-
-# Always use the Kibana API for loading the dashboards instead of autodetecting
-# how to install the dashboards by first querying Elasticsearch.
-#setup.dashboards.always_kibana: false
-
-#============================== Template =====================================
-
-# A template is used to set the mapping in Elasticsearch
-# By default template loading is enabled and the template is loaded.
-# These settings can be adjusted to load your own template or overwrite existing ones.
-
-# Set to false to disable template loading.
-setup.template.enabled: true
-
-# Template name. By default the template name is "heartbeat-%{[beat.version]}"
-# The template name and pattern has to be set in case the elasticsearch index pattern is modified.
-setup.template.name: "heartbeat-%{[beat.version]}"
-
-# Template pattern. By default the template pattern is "-%{[beat.version]}-*" to apply to the default index settings.
-# The first part is the version of the beat and then -* is used to match all daily indices.
-# The template name and pattern has to be set in case the elasticsearch index pattern is modified.
-setup.template.pattern: "heartbeat-%{[beat.version]}-*"
-
-# Path to fields.yml file to generate the template
-setup.template.fields: "${path.config}/fields.yml"
-
-# Overwrite existing template
-setup.template.overwrite: true
-
-{% include 'templates/_include_setup_template.yml.j2' %}
+#=============================== Template ======================================
+{% with beat_name="heartbeat" %}
+{%   include 'templates/_include_setup_template.yml.j2' %}
+{% endwith %}
 
 #============================== Kibana =====================================
 {% include 'templates/_include_kibana_setup.yml.j2' %}
diff --git a/elk_metrics_6x/templates/journalbeat.yml.j2 b/elk_metrics_6x/templates/journalbeat.yml.j2
index 34befbc6..beb22c02 100644
--- a/elk_metrics_6x/templates/journalbeat.yml.j2
+++ b/elk_metrics_6x/templates/journalbeat.yml.j2
@@ -574,69 +574,14 @@ tags:
 #path.logs: ${path.home}/logs
 
 #============================== Dashboards =====================================
-# These settings control loading the sample dashboards to the Kibana index. Loading
-# the dashboards is disabled by default and can be enabled either by setting the
-# options here, or by using the `-setup` CLI flag.
-dashboards.enabled: false
+{% with beat_name="journalbeat" %}
+{%   include 'templates/_include_setup_dashboards.yml.j2' %}
+{% endwith %}
 
-# The URL from where to download the dashboards archive. By default this URL
-# has a value which is computed based on the Beat name and version. For released
-# versions, this URL points to the dashboard archive on the artifacts.elastic.co
-# website.
-#dashboards.url:
-
-# The directory from where to read the dashboards. It is used instead of the URL
-# when it has a value.
-#dashboards.directory:
-
-# The file archive (zip file) from where to read the dashboards. It is used instead
-# of the URL when it has a value.
-#dashboards.file:
-
-# If this option is enabled, the snapshot URL is used instead of the default URL.
-#dashboards.snapshot: false
-
-# The URL from where to download the snapshot version of the dashboards. By default
-# this has a value which is computed based on the Beat name and version.
-#dashboards.snapshot_url
-
-# In case the archive contains the dashboards from multiple Beats, this lets you
-# select which one to load. You can load all the dashboards in the archive by
-# setting this to the empty string.
-#dashboards.beat: beatname
-
-# The name of the Kibana index to use for setting the configuration. Default is ".kibana"
-#dashboards.kibana_index: .kibana
-
-# The Elasticsearch index name. This overwrites the index name defined in the
-# dashboards and index pattern. Example: testbeat-*
-#dashboards.index:
-
-#============================== Template =====================================
-
-# A template is used to set the mapping in Elasticsearch
-# By default template loading is enabled and the template is loaded.
-# These settings can be adjusted to load your own template or overwrite existing ones.
-
-# Set to false to disable template loading.
-setup.template.enabled: true
-
-# Template name. By default the template name is "journalbeat-%{[beat.version]}"
-# The template name and pattern has to be set in case the elasticsearch index pattern is modified.
-setup.template.name: "journalbeat-%{[beat.version]}"
-
-# Template pattern. By default the template pattern is "-%{[beat.version]}-*" to apply to the default index settings.
-# The first part is the version of the beat and then -* is used to match all daily indices.
-# The template name and pattern has to be set in case the elasticsearch index pattern is modified.
-setup.template.pattern: "journalbeat-%{[beat.version]}-*"
-
-# Path to fields.yml file to generate the template
-setup.template.fields: "${path.config}/fields.yml"
-
-# Overwrite existing template
-setup.template.overwrite: true
-
-{% include 'templates/_include_setup_template.yml.j2' %}
+#=============================== Template ======================================
+{% with beat_name="journalbeat" %}
+{%   include 'templates/_include_setup_template.yml.j2' %}
+{% endwith %}
 
 #============================== Kibana =====================================
 {% include 'templates/_include_kibana_setup.yml.j2' %}
diff --git a/elk_metrics_6x/templates/metricbeat.yml.j2 b/elk_metrics_6x/templates/metricbeat.yml.j2
index ecee9657..206135c8 100644
--- a/elk_metrics_6x/templates/metricbeat.yml.j2
+++ b/elk_metrics_6x/templates/metricbeat.yml.j2
@@ -1066,66 +1066,16 @@ metricbeat.modules:
 #path.logs: ${path.home}/logs
 
 #============================== Dashboards =====================================
-# These settings control loading the sample dashboards to the Kibana index. Loading
-# the dashboards are disabled by default and can be enabled either by setting the
-# options here, or by using the `-setup` CLI flag or the `setup` command.
-setup.dashboards.enabled: true
+{% with beat_name="metricbeat" %}
+{%   include 'templates/_include_setup_dashboards.yml.j2' %}
+{% endwith %}
 
-# The directory from where to read the dashboards. The default is the `kibana`
-# folder in the home path.
-#setup.dashboards.directory: ${path.home}/kibana
+#=============================== Template ======================================
+{% with beat_name="metricbeat" %}
+{%   include 'templates/_include_setup_template.yml.j2' %}
+{% endwith %}
 
-# The URL from where to download the dashboards archive. It is used instead of
-# the directory if it has a value.
-#setup.dashboards.url:
-
-# The file archive (zip file) from where to read the dashboards. It is used instead
-# of the directory when it has a value.
-#setup.dashboards.file:
-
-# In case the archive contains the dashboards from multiple Beats, this lets you
-# select which one to load. You can load all the dashboards in the archive by
-# setting this to the empty string.
-#setup.dashboards.beat: metricbeat
-
-# The name of the Kibana index to use for setting the configuration. Default is ".kibana"
-#setup.dashboards.kibana_index: .kibana
-
-# The Elasticsearch index name. This overwrites the index name defined in the
-# dashboards and index pattern. Example: testbeat-*
-#setup.dashboards.index:
-
-# Always use the Kibana API for loading the dashboards instead of autodetecting
-# how to install the dashboards by first querying Elasticsearch.
-#setup.dashboards.always_kibana: false
-
-#============================== Template =====================================
-
-# A template is used to set the mapping in Elasticsearch
-# By default template loading is enabled and the template is loaded.
-# These settings can be adjusted to load your own template or overwrite existing ones.
-
-# Set to false to disable template loading.
-setup.template.enabled: true
-
-# Template name. By default the template name is "metricbeat-%{[beat.version]}"
-# The template name and pattern has to be set in case the elasticsearch index pattern is modified.
-setup.template.name: "metricbeat-%{[beat.version]}"
-
-# Template pattern. By default the template pattern is "-%{[beat.version]}-*" to apply to the default index settings.
-# The first part is the version of the beat and then -* is used to match all daily indices.
-# The template name and pattern has to be set in case the elasticsearch index pattern is modified.
-setup.template.pattern: "metricbeat-%{[beat.version]}-*"
-
-# Path to fields.yml file to generate the template
-setup.template.fields: "${path.config}/fields.yml"
-
-# Overwrite existing template
-setup.template.overwrite: true
-
-{% include 'templates/_include_setup_template.yml.j2' %}
-
-#============================== Kibana =====================================
+#================================ Kibana =======================================
 {% include 'templates/_include_kibana_setup.yml.j2' %}
 
 #================================ Logging ======================================
@@ -1133,10 +1083,10 @@ setup.template.overwrite: true
 {%   include 'templates/_include_beat_logging.yml.j2' %}
 {% endwith %}
 
-#============================== Xpack Monitoring =====================================
+#============================== Xpack Monitoring ===============================
 {% include 'templates/_include_xpack_elasticsearch_output.yml.j2' %}
 
-#================================ HTTP Endpoint ======================================
+#================================ HTTP Endpoint ================================
 # Each beat can expose internal metrics through a HTTP endpoint. For security
 # reasons the endpoint is disabled by default. This feature is currently experimental.
 # Stats can be access through http://localhost:5066/stats . For pretty JSON output
diff --git a/elk_metrics_6x/templates/packetbeat.yml.j2 b/elk_metrics_6x/templates/packetbeat.yml.j2
index 4b229917..239c432d 100644
--- a/elk_metrics_6x/templates/packetbeat.yml.j2
+++ b/elk_metrics_6x/templates/packetbeat.yml.j2
@@ -1047,66 +1047,16 @@ packetbeat.protocols:
 #path.logs: ${path.home}/logs
 
 #============================== Dashboards =====================================
-# These settings control loading the sample dashboards to the Kibana index. Loading
-# the dashboards are disabled by default and can be enabled either by setting the
-# options here, or by using the `-setup` CLI flag or the `setup` command.
-setup.dashboards.enabled: true
+{% with beat_name="packetbeat" %}
+{%   include 'templates/_include_setup_dashboards.yml.j2' %}
+{% endwith %}
 
-# The directory from where to read the dashboards. The default is the `kibana`
-# folder in the home path.
-#setup.dashboards.directory: ${path.home}/kibana
+#=============================== Template ======================================
+{% with beat_name="packetbeat" %}
+{%   include 'templates/_include_setup_template.yml.j2' %}
+{% endwith %}
 
-# The URL from where to download the dashboards archive. It is used instead of
-# the directory if it has a value.
-#setup.dashboards.url:
-
-# The file archive (zip file) from where to read the dashboards. It is used instead
-# of the directory when it has a value.
-#setup.dashboards.file:
-
-# In case the archive contains the dashboards from multiple Beats, this lets you
-# select which one to load. You can load all the dashboards in the archive by
-# setting this to the empty string.
-#setup.dashboards.beat: packetbeat
-
-# The name of the Kibana index to use for setting the configuration. Default is ".kibana"
-#setup.dashboards.kibana_index: .kibana
-
-# The Elasticsearch index name. This overwrites the index name defined in the
-# dashboards and index pattern. Example: testbeat-*
-#setup.dashboards.index:
-
-# Always use the Kibana API for loading the dashboards instead of autodetecting
-# how to install the dashboards by first querying Elasticsearch.
-#setup.dashboards.always_kibana: false
-
-#============================== Template =====================================
-
-# A template is used to set the mapping in Elasticsearch
-# By default template loading is enabled and the template is loaded.
-# These settings can be adjusted to load your own template or overwrite existing ones.
-
-# Set to false to disable template loading.
-setup.template.enabled: true
-
-# Template name. By default the template name is "packetbeat-%{[beat.version]}"
-# The template name and pattern has to be set in case the elasticsearch index pattern is modified.
-setup.template.name: "packetbeat-%{[beat.version]}"
-
-# Template pattern. By default the template pattern is "-%{[beat.version]}-*" to apply to the default index settings.
-# The first part is the version of the beat and then -* is used to match all daily indices.
-# The template name and pattern has to be set in case the elasticsearch index pattern is modified.
-setup.template.pattern: "packetbeat-%{[beat.version]}-*"
-
-# Path to fields.yml file to generate the template
-setup.template.fields: "${path.config}/fields.yml"
-
-# Overwrite existing template
-setup.template.overwrite: true
-
-{% include 'templates/_include_setup_template.yml.j2' %}
-
-#============================== Kibana =====================================
+#================================ Kibana =======================================
 {% include 'templates/_include_kibana_setup.yml.j2' %}
 
 #================================ Logging ======================================
@@ -1114,10 +1064,10 @@ setup.template.overwrite: true
 {%   include 'templates/_include_beat_logging.yml.j2' %}
 {% endwith %}
 
-#============================== Xpack Monitoring =====================================
+#============================== Xpack Monitoring ===============================
 {% include 'templates/_include_xpack_elasticsearch_output.yml.j2' %}
 
-#================================ HTTP Endpoint ======================================
+#================================ HTTP Endpoint ================================
 # Each beat can expose internal metrics through a HTTP endpoint. For security
 # reasons the endpoint is disabled by default. This feature is currently experimental.
 # Stats can be access through http://localhost:5066/stats . For pretty JSON output