diff --git a/elasticsearch/files/elasticsearch.yml b/elasticsearch/files/elasticsearch.yml
index 92c6a33..89a1c5c 100644
--- a/elasticsearch/files/elasticsearch.yml
+++ b/elasticsearch/files/elasticsearch.yml
@@ -43,6 +43,7 @@
 # from configuring them manually. You can tie this node to a specific name:
 #
 # node.name: "Franz Kafka"
+node.name: {{ server.get('name', '${HOSTNAME}') }}
 
 # Every node can be configured to allow or deny being eligible as the master,
 # and to allow or deny to store the data.