diff --git a/salt/kafka/nodes.sls b/salt/kafka/nodes.sls
index edc5f0701..7cafb10bc 100644
--- a/salt/kafka/nodes.sls
+++ b/salt/kafka/nodes.sls
@@ -4,6 +4,7 @@
 # Elastic License 2.0.
 
 {% from 'kafka/nodes.map.jinja' import COMBINED_KAFKANODES %}
+{% set kafka_cluster_id = salt['pillar.get']('kafka:cluster_id', default=None) %}
 
 {# Write Kafka pillar, so all grid members have access to nodeid of other kafka nodes and their roles #}
 write_kafka_pillar_yaml:
@@ -14,4 +15,11 @@ write_kafka_pillar_yaml:
     - source: salt://kafka/files/managed_node_pillar.jinja
     - template: jinja
     - context:
-        COMBINED_KAFKANODES: {{ COMBINED_KAFKANODES }}
\ No newline at end of file
+        COMBINED_KAFKANODES: {{ COMBINED_KAFKANODES }}
+
+
+{% if kafka_cluster_id is none %}
+generate_kafka_cluster_id:
+  cmd.run:
+    - name: /usr/sbin/so-kafka-clusterid
+{% endif %}
\ No newline at end of file
diff --git a/salt/kafka/soc_kafka.yaml b/salt/kafka/soc_kafka.yaml
index 2216aaaa7..505469d6b 100644
--- a/salt/kafka/soc_kafka.yaml
+++ b/salt/kafka/soc_kafka.yaml
@@ -8,7 +8,7 @@ kafka:
     advanced: True
     sensitive: True
     helpLink: kafka.html
-  kafkapass:
+  kafka_pass:
     description: The password to use for the Kafka certificates.
     sensitive: True
     helpLink: kafka.html
diff --git a/salt/kafka/storage.sls b/salt/kafka/storage.sls
index fbb7c7328..507c199c6 100644
--- a/salt/kafka/storage.sls
+++ b/salt/kafka/storage.sls
@@ -6,15 +6,7 @@
 {% from 'allowed_states.map.jinja' import allowed_states %}
 {% if sls.split('.')[0] in allowed_states %}
 {%   from 'vars/globals.map.jinja' import GLOBALS %}
-{%   set kafka_cluster_id = salt['pillar.get']('kafka:cluster_id', default=None) %}
-
-{%   if GLOBALS.role in ['so-manager', 'so-managersearch', 'so-standalone'] %}
-{%     if kafka_cluster_id is none %}
-generate_kafka_cluster_id:
-  cmd.run:
-    - name: /usr/sbin/so-kafka-clusterid
-{%     endif %}
-{%   endif %}
+{%   set kafka_cluster_id = salt['pillar.get']('kafka:cluster_id') %}
 
 {# Initialize kafka storage if it doesn't already exist. Just looking for meta.properties in /nsm/kafka/data #}
 {%   if not salt['file.file_exists']('/nsm/kafka/data/meta.properties') %}
diff --git a/salt/manager/tools/sbin/so-kafka-clusterid b/salt/manager/tools/sbin/so-kafka-clusterid
index 829e4fc87..eb0701b8b 100644
--- a/salt/manager/tools/sbin/so-kafka-clusterid
+++ b/salt/manager/tools/sbin/so-kafka-clusterid
@@ -18,12 +18,12 @@ else
   source $(dirname $0)/../../../common/tools/sbin/so-common
 fi
 
-if ! grep -q "^  cluster_id:" $local_salt_dir/pillar/kafka/soc_kafka.sls; then
+if ! grep -q "^    cluster_id:" $local_salt_dir/pillar/kafka/soc_kafka.sls; then
     kafka_cluster_id=$(get_random_value 22)
-    echo '  cluster_id: '$kafka_cluster_id >> $local_salt_dir/pillar/kafka/soc_kafka.sls
+    echo '    cluster_id: '$kafka_cluster_id >> $local_salt_dir/pillar/kafka/soc_kafka.sls
 fi
 
-if ! grep -q "^  kafkapass:" $local_salt_dir/pillar/kafka/soc_kafka.sls; then
+if ! grep -q "^    kafka_pass:" $local_salt_dir/pillar/kafka/soc_kafka.sls; then
     kafkapass=$(get_random_value)
-    echo '  kafkapass: '$kafkapass >> $local_salt_dir/pillar/kafka/soc_kafka.sls
-fi
\ No newline at end of file
+    echo '    kafka_pass: '$kafkapass >> $local_salt_dir/pillar/kafka/soc_kafka.sls
+fit
\ No newline at end of file