diff --git a/salt/common/tools/sbin/so-minion b/salt/common/tools/sbin/so-minion
index ea605bc09..dc9d1e2fa 100755
--- a/salt/common/tools/sbin/so-minion
+++ b/salt/common/tools/sbin/so-minion
@@ -129,10 +129,6 @@ function add_elastic_to_minion() {
     printf '%s\n'\
 		"elasticsearch:"\
 		"  esheap: '$ES_HEAP_SIZE'"\
-		"  config:"\
-		"    node:"\
-		"      attr:"\
-		"        box_type: hot"\
 		"  " >> $PILLARFILE
 }
 
diff --git a/salt/elasticsearch/config.map.jinja b/salt/elasticsearch/config.map.jinja
index ce955e93f..bc0a71b81 100644
--- a/salt/elasticsearch/config.map.jinja
+++ b/salt/elasticsearch/config.map.jinja
@@ -4,26 +4,23 @@
 
 {% set HIGHLANDER = salt['pillar.get']('global:highlander', False) %}
 
-{% if grains.id.split('_') | last in ['manager','managersearch'] %}
+{% if grains.id.split('_') | last in ['manager','managersearch','standalone'] %}
     {% if LOGSTASH_NODES | length > 1 %}
-    {% do ESCONFIG.elasticsearch.config.node.update({'roles': ['master', 'data', 'remote_cluster_client']}) %}
-    {% if HIGHLANDER %}
-        {% do ESCONFIG.elasticsearch.config.node.roles.extend(['ml', 'transform']) %}
+      {% do ESCONFIG.elasticsearch.config.update({'discovery': {'seed_hosts': []}}) %}
+      {% for NODE in LOGSTASH_NODES %}
+        {% do ESCONFIG.elasticsearch.config.discovery.seed_hosts.append(NODE.keys()|first) %}
+      {% endfor %}
+      {% if grains.id.split('_') | last == 'manager' %}
+        {% do ESCONFIG.elasticsearch.config.node.update({'roles': ['master','remote_cluster_client']}) %}
+      {% else %}
+        {% do ESCONFIG.elasticsearch.config.node.update({'roles': ['master', 'data', 'remote_cluster_client']}) %}
+      {% endif %}
     {% endif %}
-    {% do ESCONFIG.elasticsearch.config.update({'discovery': {'seed_hosts': []}}) %}
-    {% for NODE in LOGSTASH_NODES %}
-      {% do ESCONFIG.elasticsearch.config.discovery.seed_hosts.append(NODE.keys()|first) %}
-    {% endfor %}
-  {% endif %}
-  {% if grains.id.split('_') | last == 'manager' %}
-    {% do ESCONFIG.elasticsearch.config.node.attr.update({'box_type': ''}) %}
-  {% endif %}
-{% elif grains.id.split('_') | last not in ['eval', 'standalone', 'import'] %}
+{% elif grains.id.split('_') | last == 'searchnode' %}
   {% do ESCONFIG.elasticsearch.config.node.update({'roles': ['data', 'ingest']}) %}
   {% if HIGHLANDER %}
         {% do ESCONFIG.elasticsearch.config.node.roles.extend(['ml', 'master', 'transform']) %}
   {% endif %}
-  {% do ESCONFIG.elasticsearch.config.node.attr.update({'box_type': 'hot'}) %}
   {% do ESCONFIG.elasticsearch.config.update({'discovery': {'seed_hosts': [GLOBALS.manager]}}) %}
 {% endif %}
 {% if HIGHLANDER %}
diff --git a/salt/elasticsearch/defaults.yaml b/salt/elasticsearch/defaults.yaml
index d47125972..0680350e2 100644
--- a/salt/elasticsearch/defaults.yaml
+++ b/salt/elasticsearch/defaults.yaml
@@ -1,8 +1,6 @@
 elasticsearch:
   config:
-    node:
-      attr:
-        box_type: hot
+    node: {}
     cluster:
       routing:
         allocation:
diff --git a/salt/elasticsearch/templates/component/so/case-settings.json b/salt/elasticsearch/templates/component/so/case-settings.json
index 46c3cdeb9..fd0de349c 100644
--- a/salt/elasticsearch/templates/component/so/case-settings.json
+++ b/salt/elasticsearch/templates/component/so/case-settings.json
@@ -2,13 +2,6 @@
   "template": {
     "settings": {
       "index": {
-        "routing": {
-          "allocation": {
-            "require": {
-              "box_type": "hot"
-            }
-          }
-        },
         "mapping": {
           "total_fields": {
             "limit": "3000"
diff --git a/salt/elasticsearch/templates/component/so/common-settings.json b/salt/elasticsearch/templates/component/so/common-settings.json
index 7d60192c3..34c9e2b18 100644
--- a/salt/elasticsearch/templates/component/so/common-settings.json
+++ b/salt/elasticsearch/templates/component/so/common-settings.json
@@ -2,13 +2,6 @@
   "template": {
     "settings": {
       "index": {
-        "routing": {
-          "allocation": {
-            "require": {
-              "box_type": "hot"
-            }
-          }
-        },
         "mapping": {
           "total_fields": {
             "limit": "3000"
diff --git a/salt/firewall/assigned_hostgroups.map.yaml b/salt/firewall/assigned_hostgroups.map.yaml
index 2e54a5e9f..fec694541 100644
--- a/salt/firewall/assigned_hostgroups.map.yaml
+++ b/salt/firewall/assigned_hostgroups.map.yaml
@@ -295,6 +295,7 @@ role:
               - {{ portgroups.sensoroni }}
               - {{ portgroups.yum }}
               - {{ portgroups.redis }}
+              - {{ portgroups.elasticsearch_rest }}
               - {{ portgroups.elasticsearch_node }}
           heavynodes:
             portgroups:
@@ -303,6 +304,7 @@ role:
               - {{ portgroups.sensoroni }}
               - {{ portgroups.yum }}
               - {{ portgroups.redis }}
+              - {{ portgroups.elasticsearch_rest }}
               - {{ portgroups.elasticsearch_node }}
           self:
             portgroups:
@@ -355,47 +357,6 @@ role:
           heavynodes:
             portgroups:
               - {{ portgroups.salt_manager }}
-  helixsensor:
-    chain:
-      DOCKER-USER:
-        hostgroups:
-          manager:
-            portgroups:
-              - {{ portgroups.playbook }}
-              - {{ portgroups.mysql }}
-              - {{ portgroups.kibana }}
-              - {{ portgroups.redis }}
-              - {{ portgroups.influxdb }}
-              - {{ portgroups.elasticsearch_rest }}
-              - {{ portgroups.elasticsearch_node }}
-          sensors:
-            portgroups:
-              - {{ portgroups.beats_5044 }}
-              - {{ portgroups.beats_5644 }}
-          searchnodes:
-            portgroups:
-              - {{ portgroups.redis }}
-              - {{ portgroups.elasticsearch_node }}
-          self:
-            portgroups:
-              - {{ portgroups.syslog}}
-          beats_endpoint:
-            portgroups:
-              - {{ portgroups.beats_5044 }}
-          analyst:
-            portgroups:
-              - {{ portgroups.nginx }}
-      INPUT:
-        hostgroups:
-          anywhere:
-            portgroups:
-              - {{ portgroups.ssh }}
-          dockernet:
-            portgroups:
-              - {{ portgroups.all }}
-          localhost:
-            portgroups:
-              - {{ portgroups.all }}
   searchnode:
     chain:
       DOCKER-USER: