diff --git a/elk_metrics_7x/roles/elastic_auditbeat/templates/auditbeat.yml.j2 b/elk_metrics_7x/roles/elastic_auditbeat/templates/auditbeat.yml.j2
index 734556e6..5fe36e4e 100644
--- a/elk_metrics_7x/roles/elastic_auditbeat/templates/auditbeat.yml.j2
+++ b/elk_metrics_7x/roles/elastic_auditbeat/templates/auditbeat.yml.j2
@@ -207,7 +207,9 @@ auditbeat.modules:
 # The name of the shipper that publishes the network data. It can be used to group
 # all the transactions sent by a single shipper in the web interface.
 # If this options is not defined, the hostname is used.
-#name:
+{% if elastic_hostname is defined %}
+name: {{ elastic_hostname }}
+{% endif %}
 
 # The tags of the shipper are included in their own field with each
 # transaction published. Tags make it easy to group servers by different
diff --git a/elk_metrics_7x/roles/elastic_filebeat/templates/filebeat.yml.j2 b/elk_metrics_7x/roles/elastic_filebeat/templates/filebeat.yml.j2
index 9470f765..033c9652 100644
--- a/elk_metrics_7x/roles/elastic_filebeat/templates/filebeat.yml.j2
+++ b/elk_metrics_7x/roles/elastic_filebeat/templates/filebeat.yml.j2
@@ -1100,7 +1100,9 @@ filebeat.inputs:
 # The name of the shipper that publishes the network data. It can be used to group
 # all the transactions sent by a single shipper in the web interface.
 # If this options is not defined, the hostname is used.
-#name:
+{% if elastic_hostname is defined %}
+name: {{ elastic_hostname }}
+{% endif %}
 
 # The tags of the shipper are included in their own field with each
 # transaction published. Tags make it easy to group servers by different
diff --git a/elk_metrics_7x/roles/elastic_heartbeat/templates/heartbeat.yml.j2 b/elk_metrics_7x/roles/elastic_heartbeat/templates/heartbeat.yml.j2
index cfa7f968..192da36c 100644
--- a/elk_metrics_7x/roles/elastic_heartbeat/templates/heartbeat.yml.j2
+++ b/elk_metrics_7x/roles/elastic_heartbeat/templates/heartbeat.yml.j2
@@ -334,7 +334,9 @@ heartbeat.scheduler:
 # The name of the shipper that publishes the network data. It can be used to group
 # all the transactions sent by a single shipper in the web interface.
 # If this options is not defined, the hostname is used.
-#name:
+{% if elastic_hostname is defined %}
+name: {{ elastic_hostname }}
+{% endif %}
 
 # The tags of the shipper are included in their own field with each
 # transaction published. Tags make it easy to group servers by different
diff --git a/elk_metrics_7x/roles/elastic_journalbeat/templates/journalbeat.yml.j2 b/elk_metrics_7x/roles/elastic_journalbeat/templates/journalbeat.yml.j2
index f54a15de..9d68f0c4 100644
--- a/elk_metrics_7x/roles/elastic_journalbeat/templates/journalbeat.yml.j2
+++ b/elk_metrics_7x/roles/elastic_journalbeat/templates/journalbeat.yml.j2
@@ -70,7 +70,9 @@ setup.template.settings:
 # The name of the shipper that publishes the network data. It can be used to group
 # all the transactions sent by a single shipper in the web interface.
 # If this options is not defined, the hostname is used.
-# name: journalbeat
+{% if elastic_hostname is defined %}
+name: {{ elastic_hostname }}
+{% endif %}
 
 # The tags of the shipper are included in their own field with each
 # transaction published. Tags make it easy to group servers by different
diff --git a/elk_metrics_7x/roles/elastic_metricbeat/templates/metricbeat.yml.j2 b/elk_metrics_7x/roles/elastic_metricbeat/templates/metricbeat.yml.j2
index 1a299dd1..0cfdf87f 100644
--- a/elk_metrics_7x/roles/elastic_metricbeat/templates/metricbeat.yml.j2
+++ b/elk_metrics_7x/roles/elastic_metricbeat/templates/metricbeat.yml.j2
@@ -961,7 +961,9 @@ metricbeat.modules:
 # The name of the shipper that publishes the network data. It can be used to group
 # all the transactions sent by a single shipper in the web interface.
 # If this options is not defined, the hostname is used.
-#name:
+{% if elastic_hostname is defined %}
+name: {{ elastic_hostname }}
+{% endif %}
 
 # The tags of the shipper are included in their own field with each
 # transaction published. Tags make it easy to group servers by different
diff --git a/elk_metrics_7x/roles/elastic_packetbeat/templates/packetbeat.yml.j2 b/elk_metrics_7x/roles/elastic_packetbeat/templates/packetbeat.yml.j2
index 8c0d6841..dbe7cbd4 100644
--- a/elk_metrics_7x/roles/elastic_packetbeat/templates/packetbeat.yml.j2
+++ b/elk_metrics_7x/roles/elastic_packetbeat/templates/packetbeat.yml.j2
@@ -630,7 +630,9 @@ packetbeat.ignore_outgoing: false
 # The name of the shipper that publishes the network data. It can be used to group
 # all the transactions sent by a single shipper in the web interface.
 # If this options is not defined, the hostname is used.
-#name:
+{% if elastic_hostname is defined %}
+name: {{ elastic_hostname }}
+{% endif %}
 
 # The tags of the shipper are included in their own field with each
 # transaction published. Tags make it easy to group servers by different