diff --git a/salt/elasticsearch/enabled.sls b/salt/elasticsearch/enabled.sls
index 1d25fa668..b619854ed 100644
--- a/salt/elasticsearch/enabled.sls
+++ b/salt/elasticsearch/enabled.sls
@@ -204,10 +204,10 @@ so-elasticsearch-roles-load:
       - docker_container: so-elasticsearch
       - file: elasticsearch_sbin_jinja
 
-{%     if grains.role in ['so-managersearch', 'so-heavynode', 'so-manager'] %}
+{%     if grains.role in ['so-managersearch', 'so-manager'] %}
 {%       set ap = "absent" %}
 {%     endif %}
-{%     if grains.role in ['so-eval', 'so-standalone'] %}
+{%     if grains.role in ['so-eval', 'so-standalone', 'so-heavynode'] %}
 {%       if ELASTICSEARCHMERGED.index_clean %}
 {%         set ap = "present" %}
 {%       else %}