diff --git a/salt/vars/managersearch.map.jinja b/salt/vars/managersearch.map.jinja
new file mode 100644
index 000000000..c2a3d9628
--- /dev/null
+++ b/salt/vars/managersearch.map.jinja
@@ -0,0 +1,15 @@
+{% from 'vars/elasticsearch.map.jinja' import ELASTICSEARCH_GLOBALS %}
+{% from 'vars/logstash.map.jinja' import LOGSTASH_GLOBALS %}
+
+{% set ROLE_GLOBALS = {} %}
+
+{% set MANAGERSEARCH_GLOBALS =
+   [
+     ELASTICSEARCH_GLOBALS,
+     LOGSTASH_GLOBALS
+   ]
+%}
+
+{% for sg in MANAGERSEARCH_GLOBALS %}
+{%   do salt['defaults.merge'](ROLE_GLOBALS, sg, merge_lists=False, in_place=True) %}
+{% endfor %}
diff --git a/salt/vars/searchnode.map.jinja b/salt/vars/searchnode.map.jinja
index 2efabefed..3b9d91bfc 100644
--- a/salt/vars/searchnode.map.jinja
+++ b/salt/vars/searchnode.map.jinja
@@ -3,13 +3,13 @@
 
 {% set ROLE_GLOBALS = {} %}
 
-{% set STANDALONE_GLOBALS =
+{% set SEARCHNODE_GLOBALS =
    [
      ELASTICSEARCH_GLOBALS,
      LOGSTASH_GLOBALS
    ]
 %}
 
-{% for sg in STANDALONE_GLOBALS %}
+{% for sg in SEARCHNODE_GLOBALS %}
 {%   do salt['defaults.merge'](ROLE_GLOBALS, sg, merge_lists=False, in_place=True) %}
 {% endfor %}