diff --git a/salt/kafka/init.sls b/salt/kafka/init.sls
index 0a9b3305f..038920cb8 100644
--- a/salt/kafka/init.sls
+++ b/salt/kafka/init.sls
@@ -18,7 +18,12 @@ include:
   - kafka.nodes
 {% endif %}
 {% if GLOBALS.pipeline == "KAFKA" and KAFKAMERGED.enabled %}
+{%   if grains.role in ['so-manager', 'so-managersearch', 'so-standalone', 'so-receiver'] %}
   - kafka.enabled
+{# Searchnodes only run kafka.ssl state when Kafka is enabled #}
+{%   elif grains.role == "so-searchnode" %}
+  - kafka.ssl
+{%   endif %}
 {% else %}
   - kafka.disabled
 {% endif %}
diff --git a/salt/top.sls b/salt/top.sls
index 3bd3b2d34..7365e0e83 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -155,6 +155,7 @@ base:
     - nginx
     - elasticfleet.install_agent_grid
     - stig
+    - kafka
 
   '*_managersearch and G@saltversion:{{saltversion}}':
     - match: compound
@@ -184,6 +185,7 @@ base:
     - utility
     - elasticfleet
     - stig
+    - kafka
 
   '*_heavynode and G@saltversion:{{saltversion}}':
     - match: compound