diff --git a/salt/firewall/defaults.yaml b/salt/firewall/defaults.yaml
index 578a242f9..75df49b25 100644
--- a/salt/firewall/defaults.yaml
+++ b/salt/firewall/defaults.yaml
@@ -289,6 +289,11 @@ firewall:
                 - elastic_agent_control
                 - elastic_agent_data
                 - elastic_agent_update
+            desktop:
+              portgroups:
+                - elastic_agent_control
+                - elastic_agent_data
+                - elastic_agent_update
             customhostgroup0:
               portgroups: []
             customhostgroup1:
@@ -467,6 +472,9 @@ firewall:
                 - influxdb
                 - sensoroni
                 - yum
+                - elastic_agent_control
+                - elastic_agent_data
+                - elastic_agent_update
             customhostgroup0:
               portgroups: []
             customhostgroup1:
@@ -658,6 +666,9 @@ firewall:
                 - influxdb
                 - sensoroni
                 - yum
+                - elastic_agent_control
+                - elastic_agent_data
+                - elastic_agent_update
             customhostgroup0:
               portgroups: []
             customhostgroup1:
@@ -857,6 +868,9 @@ firewall:
                 - influxdb
                 - sensoroni
                 - yum
+                - elastic_agent_control
+                - elastic_agent_data
+                - elastic_agent_update
             customhostgroup0:
               portgroups: []
             customhostgroup1:
@@ -1214,9 +1228,6 @@ firewall:
             analyst:
               portgroups:
                 - nginx
-            desktop:
-              portgroups:
-                - yum
             customhostgroup0:
               portgroups: []
             customhostgroup1:
diff --git a/salt/top.sls b/salt/top.sls
index b8ca0f14e..6db19b361 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -268,6 +268,7 @@ base:
     - ssl
     - sensoroni
     - telegraf
+    - elasticfleet.install_agent_grid
 
   'J@desktop:gui:enabled:^[Tt][Rr][Uu][Ee]$ and ( G@saltversion:{{saltversion}} and G@os:OEL )':
     - match: compound