diff --git a/salt/libvirt/bridge.sls b/salt/libvirt/bridge.sls
index 9e8c59f90..cc28bd8b7 100644
--- a/salt/libvirt/bridge.sls
+++ b/salt/libvirt/bridge.sls
@@ -6,6 +6,7 @@
 # We do not import GLOBALS in this state because it is called during setup
 include:
   - salt.minion.service_file
+  - salt.mine_functions
 
 down_original_mgmt_interface:
   cmd.run:
@@ -32,6 +33,7 @@ wait_for_br0_ip:
       - cmd: down_original_mgmt_interface
     - onchanges_in:
       - file: salt_minion_service_unit_file
+      - file: mine_functions
 
 restart_salt_minion_service:
   service.running:
@@ -39,3 +41,4 @@ restart_salt_minion_service:
     - enable: True
     - listen:
       - file: salt_minion_service_unit_file
+      - file: mine_functions
diff --git a/salt/salt/map.jinja b/salt/salt/map.jinja
index 1e3b200f4..81baa100a 100644
--- a/salt/salt/map.jinja
+++ b/salt/salt/map.jinja
@@ -4,7 +4,7 @@
    Elastic License 2.0. #}
 
 {% set role = salt['grains.get']('role', '') %}
-{% if role in ['so-hypervisor','so-managerhype'] and salt['network.ip_addrs']('br0')|length > 0 %}
+{% if role in ['so-hypervisor','so-managerhype'] %}
 {%   set interface = 'br0' %}
 {% else %}
 {%   set interface = pillar.host.mainint %}
diff --git a/setup/so-functions b/setup/so-functions
index 4434dc908..00f2e46c1 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1195,7 +1195,9 @@ hypervisor_local_states() {
         logCmd "salt-call state.apply libvirt.64962 --local --file-root=../salt/ -l info queue=True"
         info "Setting up bridge for $MNIC"
 		salt-call state.apply libvirt.bridge --local --file-root=../salt/ -l info pillar='{"host": {"mainint": "'$MNIC'"}}' queue=True
-	    logCmd "salt-call state.apply salt.minion queue=True"
+		if [ $is_managerhype ]; then
+	    	logCmd "salt-call state.apply salt.minion queue=True"
+		fi
     fi
 }