diff --git a/salt/firewall/containers.map.jinja b/salt/firewall/containers.map.jinja
index cc0a20299..2d1135e5f 100644
--- a/salt/firewall/containers.map.jinja
+++ b/salt/firewall/containers.map.jinja
@@ -21,7 +21,7 @@
      'so-strelka-filestream'
 ] %}
 
-{% elif GLOBALS.role == 'so-manager' or GLOBALS.role == 'so-standalone' or GLOBALS.role == 'so-managersearch' %}
+{% elif GLOBALS.role in ['so-manager', 'so-standalone','so-managersearch', 'so-managerhype'] %}
 {% set NODE_CONTAINERS = [
      'so-dockerregistry',
      'so-elasticsearch',
diff --git a/salt/manager/tools/sbin/so-firewall-minion b/salt/manager/tools/sbin/so-firewall-minion
index 4b0fb766e..8b8fbfc99 100755
--- a/salt/manager/tools/sbin/so-firewall-minion
+++ b/salt/manager/tools/sbin/so-firewall-minion
@@ -51,6 +51,10 @@ fi
         'MANAGER')
 			so-firewall includehost manager "$IP"
 			;;
+		'MANAGERHYPE')
+			so-firewall includehost manager "$IP"
+			so-firewall includehost hypervisor "$IP" --apply
+			;;
 		'MANAGERSEARCH')
 			so-firewall includehost manager "$IP"
 			so-firewall includehost searchnode "$IP" --apply
diff --git a/setup/so-functions b/setup/so-functions
index 3cad975fd..d28d7baf3 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -2234,7 +2234,7 @@ set_hostname() {
 
 set_initial_firewall_policy() {
 	case "$install_type" in
-		'EVAL' | 'MANAGER' | 'MANAGERSEARCH' | 'STANDALONE' | 'IMPORT')
+		'EVAL' | 'MANAGER' | 'MANAGERHYPE' | 'MANAGERSEARCH' | 'STANDALONE' | 'IMPORT')
 			so-firewall includehost $minion_type $MAINIP --apply
 			;;
 	esac