diff --git a/salt/top.sls b/salt/top.sls
index f7f73d4a6..bab7b475f 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -292,48 +292,7 @@ base:
     {%- endif %}
     - docker_clean
 
-  # Search node logic
-
-  '*_node and I@node:node_type:parser and G@saltversion:{{saltversion}}':
-    - match: compound
-    - firewall
-    {%- if LOGSTASH %}
-    - logstash
-    {%- endif %}
-    {%- if FLEETMANAGER or FLEETNODE %}
-    - fleet.install_package
-    {%- endif %}
-    - schedule
-    - docker_clean
-
-  '*_node and I@node:node_type:hot and G@saltversion:{{saltversion}}':
-    - match: compound
-    - firewall
-    {%- if LOGSTASH %}
-    - logstash
-    {%- endif %}
-    {%- if CURATOR %}
-    - curator
-    {%- endif %}
-    {%- if FLEETMANAGER or FLEETNODE %}
-    - fleet.install_package
-    {%- endif %}
-    - schedule
-    - docker_clean
-
-  '*_node and I@node:node_type:warm and G@saltversion:{{saltversion}}':
-    - match: compound
-    - firewall
-    {%- if ELASTICSEARCH %}
-    - elasticsearch
-    {%- endif %}
-    {%- if FLEETMANAGER or FLEETNODE %}
-    - fleet.install_package
-    {%- endif %}
-    - schedule
-    - docker_clean
-
-  '*_searchnode and G@saltversion:{{saltversion}}':
+    '*_searchnode and G@saltversion:{{saltversion}}':
     - match: compound
     - ca
     - ssl
@@ -361,21 +320,6 @@ base:
     - schedule
     - docker_clean
 
-  '*_managersensor and G@saltversion:{{saltversion}}':
-    - match: compound
-    - nginx
-    - telegraf
-    - influxdb
-    - grafana
-    - firewall
-    - sensor
-    - manager
-    {%- if FLEETMANAGER or FLEETNODE %}
-    - fleet.install_package
-    {%- endif %}
-    - schedule
-    - docker_clean
-
   '*_managersearch and G@saltversion:{{saltversion}}':
     - match: compound
     - salt.master