diff --git a/ansible/roles/es6/templates/elasticsearch.yml.j2 b/ansible/roles/es6/templates/elasticsearch.yml.j2
index b1fa03375519619f4485f31de769b940bec2640b..3a7f93248739636ea636fab8da52b440d505ee13 100644
--- a/ansible/roles/es6/templates/elasticsearch.yml.j2
+++ b/ansible/roles/es6/templates/elasticsearch.yml.j2
@@ -7,10 +7,10 @@
 cluster.name: elasticsearch
 {% endif %}
 
-{% if (groups['composite-search-cluster']|length) == 1 %}
+{% if (groups['es']|length) == 1 %}
 discovery.zen.minimum_master_nodes: 1
 {% else %}
-discovery.zen.minimum_master_nodes: "{{ ((groups['composite-search-cluster']|length) / 2 +1) | round(0, 'ceil') | int}}"
+discovery.zen.minimum_master_nodes: "{{ ((groups['es']|length) / 2 +1) | round(0, 'ceil') | int}}"
 {% endif %}
 
 {% if es_config['node.name'] is not defined %}
diff --git a/ansible/roles/log-es6/templates/elasticsearch.yml.j2 b/ansible/roles/log-es6/templates/elasticsearch.yml.j2
index 3cdbe5ab7145df35b8e2a4f028d32d04906455ba..9896606915636c7e86f9632fa8d37d636bae3ab9 100644
--- a/ansible/roles/log-es6/templates/elasticsearch.yml.j2
+++ b/ansible/roles/log-es6/templates/elasticsearch.yml.j2
@@ -7,6 +7,12 @@
 cluster.name: elasticsearch
 {% endif %}
 
+{% if (groups['log-es']|length) == 1 %}
+discovery.zen.minimum_master_nodes: 1
+{% else %}
+discovery.zen.minimum_master_nodes: "{{ ((groups['log-es']|length) / 2 +1) | round(0, 'ceil') | int}}"
+{% endif %}
+
 {% if es_config['node.name'] is not defined %}
 node.name: {{inventory_hostname}}-{{es_instance_name}}
 {% endif %}