diff --git a/salt/elasticsearch/config.map.jinja b/salt/elasticsearch/config.map.jinja
index d367de287..040d4751e 100644
--- a/salt/elasticsearch/config.map.jinja
+++ b/salt/elasticsearch/config.map.jinja
@@ -22,6 +22,9 @@
         {% do ELASTICSEARCHDEFAULTS.elasticsearch.config.node.roles.extend(['ml', 'master', 'transform']) %}
   {% endif %}
   {% do ELASTICSEARCHDEFAULTS.elasticsearch.config.update({'discovery': {'seed_hosts': [GLOBALS.manager]}}) %}
+{% elif grains.id.split('_') | last == 'heavynode' %}
+  {% do ELASTICSEARCHDEFAULTS.elasticsearch.config.node.update({'roles': ['master', 'data_hot', 'remote_cluster_client']}) %}
+  {% do ELASTICSEARCHDEFAULTS.elasticsearch.config.update({'discovery': {'seed_hosts': [GLOBALS.hostname]}}) %}
 {% endif %}
 {% if HIGHLANDER %}
       {% do ELASTICSEARCHDEFAULTS.elasticsearch.config.xpack.ml.update({'enabled': true}) %}
diff --git a/setup/so-setup b/setup/so-setup
index 5f96106a5..53dba8cfd 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -489,9 +489,13 @@ if ! [[ -f $install_opt_file ]]; then
 		check_requirements "heavynode"
 		calculate_useable_cores
 		networking_needful
+		check_network_manager_conf
+		set_network_dev_status_list
 		collect_mngr_hostname
 		add_mngr_ip_to_hosts
 		check_manager_connection
+		detect_cloud
+		whiptail_sensor_nics
 		set_minion_info
 		whiptail_end_settings