diff --git a/salt/firewall/assigned_hostgroups.map.yaml b/salt/firewall/assigned_hostgroups.map.yaml
index f12cfc634..1d39b6a0d 100644
--- a/salt/firewall/assigned_hostgroups.map.yaml
+++ b/salt/firewall/assigned_hostgroups.map.yaml
@@ -220,7 +220,7 @@ role:
     chain:
       DOCKER-USER:
         hostgroups:
-          manager:
+          standalone:
             portgroups:
               - {{ portgroups.playbook }}
               - {{ portgroups.mysql }}
@@ -229,6 +229,18 @@ role:
               - {{ portgroups.influxdb }}
               - {{ portgroups.elasticsearch_rest }}
               - {{ portgroups.elasticsearch_node }}
+              - {{ portgroups.docker_registry }}
+              - {{ portgroups.influxdb }}
+              - {{ portgroups.sensoroni }}
+              - {{ portgroups.yum }}
+              - {{ portgroups.beats_5044 }}
+              - {{ portgroups.beats_5644 }}
+              - {{ portgroups.redis }}
+              - {{ portgroups.elasticsearch_node }}
+              - {{ portgroups.elastic_agent_control }}
+              - {{ portgroups.elastic_agent_data }}
+              - {{ portgroups.endgame }}
+              - {{ portgroups.strelka_frontend }}
           minion:
             portgroups:
               - {{ portgroups.docker_registry }}
@@ -237,14 +249,26 @@ role:
               - {{ portgroups.yum }}
           sensors:
             portgroups:
+              - {{ portgroups.docker_registry }}
+              - {{ portgroups.influxdb }}
+              - {{ portgroups.sensoroni }}
+              - {{ portgroups.yum }}
               - {{ portgroups.beats_5044 }}
               - {{ portgroups.beats_5644 }}
           searchnodes:
             portgroups:
+              - {{ portgroups.docker_registry }}
+              - {{ portgroups.influxdb }}
+              - {{ portgroups.sensoroni }}
+              - {{ portgroups.yum }}
               - {{ portgroups.redis }}
               - {{ portgroups.elasticsearch_node }}
           heavynodes:
             portgroups:
+              - {{ portgroups.docker_registry }}
+              - {{ portgroups.influxdb }}
+              - {{ portgroups.sensoroni }}
+              - {{ portgroups.yum }}
               - {{ portgroups.redis }}
               - {{ portgroups.elasticsearch_node }}
           self:
@@ -286,6 +310,19 @@ role:
           localhost:
             portgroups:
               - {{ portgroups.all }}
+          standalone:
+            portgroups:
+              - {{ portgroups.salt_manager }}
+          sensors:
+            portgroups:
+              - {{ portgroups.salt_manager }}
+                    minion:
+          searchnodes:
+            portgroups:
+              - {{ portgroups.salt_manager }}
+          heavynodes:
+            portgroups:
+              - {{ portgroups.salt_manager }}
           minion:
             portgroups:
               - {{ portgroups.salt_manager }}