diff --git a/addons/elasticsearch/configs/elasticsearch-6.yml.tpl b/addons/elasticsearch/configs/elasticsearch-6.yml.tpl
index db6a62d03..3571aeb3e 100644
--- a/addons/elasticsearch/configs/elasticsearch-6.yml.tpl
+++ b/addons/elasticsearch/configs/elasticsearch-6.yml.tpl
@@ -13,7 +13,7 @@
 {{- end }}
 
 cluster:
-  name: {{ .CLUSTER_NAMESPACE }}
+  name: {{ $clusterName }}
   routing:
     allocation:
       awareness:
diff --git a/addons/elasticsearch/configs/elasticsearch-7.yml.tpl b/addons/elasticsearch/configs/elasticsearch-7.yml.tpl
index 54c1afcd4..7b856f1d7 100644
--- a/addons/elasticsearch/configs/elasticsearch-7.yml.tpl
+++ b/addons/elasticsearch/configs/elasticsearch-7.yml.tpl
@@ -13,7 +13,7 @@
 {{- end }}
 
 cluster:
-  name: {{ .CLUSTER_NAMESPACE }}
+  name: {{ $clusterName }}
   routing:
     allocation:
       awareness:
diff --git a/addons/elasticsearch/configs/elasticsearch-8.yml.tpl b/addons/elasticsearch/configs/elasticsearch-8.yml.tpl
index ff2cf2723..3520bf551 100644
--- a/addons/elasticsearch/configs/elasticsearch-8.yml.tpl
+++ b/addons/elasticsearch/configs/elasticsearch-8.yml.tpl
@@ -8,7 +8,7 @@
 {{- end }}
 
 cluster:
-  name: {{ .CLUSTER_NAMESPACE }}
+  name: {{ $clusterName }}
   routing:
     allocation:
       awareness: