diff --git a/salt/salt/etc/minion.d/mine_functions.conf.jinja b/salt/salt/etc/minion.d/mine_functions.conf.jinja
index 529dee3b0..fb721512f 100644
--- a/salt/salt/etc/minion.d/mine_functions.conf.jinja
+++ b/salt/salt/etc/minion.d/mine_functions.conf.jinja
@@ -1,7 +1,13 @@
+{% if grains.role == 'so-hypervisor' %}
+{%   set interface = 'br0' %}
+{% else %}
+{%   set interface = pillar.host.mainint %}
+{% endif %}
+
 mine_interval: 25
 mine_functions:
   network.ip_addrs:
-    - interface: {{ pillar.host.mainint }}
+    - interface: {{ interface }}
 {%- if grains.role in ['so-eval','so-import','so-manager','so-managersearch','so-standalone'] %}
   x509.get_pem_entries:
     - glob_path: '/etc/pki/ca.crt'
diff --git a/setup/so-setup b/setup/so-setup
index 1c7efbd68..5ae0a5218 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -629,7 +629,6 @@ if ! [[ -f $install_opt_file ]]; then
 		check_requirements
 		networking_needful
 		configure_hyper_bridge
-		MNIC=br0
 		collect_mngr_hostname
 		add_mngr_ip_to_hosts
 		check_manager_connection