diff --git a/ansible/roles/es6/templates/elasticsearch.yml.j2 b/ansible/roles/es6/templates/elasticsearch.yml.j2
index 3a7f93248739636ea636fab8da52b440d505ee13..80b846e2dc4bb2a6675832b6b3a1d8a57977e87b 100644
--- a/ansible/roles/es6/templates/elasticsearch.yml.j2
+++ b/ansible/roles/es6/templates/elasticsearch.yml.j2
@@ -7,7 +7,7 @@
 cluster.name: elasticsearch
 {% endif %}
 
-{% if (groups['es']|length) == 1 %}
+{% if (groups['es']|length) <= 2 %}
 discovery.zen.minimum_master_nodes: 1
 {% else %}
 discovery.zen.minimum_master_nodes: "{{ ((groups['es']|length) / 2 +1) | round(0, 'ceil') | int}}"
diff --git a/ansible/roles/log-es6/templates/elasticsearch.yml.j2 b/ansible/roles/log-es6/templates/elasticsearch.yml.j2
index 9896606915636c7e86f9632fa8d37d636bae3ab9..fe970ef007cb0f3f3ab02fb05a4e205910d74edf 100644
--- a/ansible/roles/log-es6/templates/elasticsearch.yml.j2
+++ b/ansible/roles/log-es6/templates/elasticsearch.yml.j2
@@ -7,7 +7,7 @@
 cluster.name: elasticsearch
 {% endif %}
 
-{% if (groups['log-es']|length) == 1 %}
+{% if (groups['log-es']|length) <= 2 %}
 discovery.zen.minimum_master_nodes: 1
 {% else %}
 discovery.zen.minimum_master_nodes: "{{ ((groups['log-es']|length) / 2 +1) | round(0, 'ceil') | int}}"