diff --git a/salt/elasticfleet/enabled.sls b/salt/elasticfleet/enabled.sls
index 50290bf09..af5e552eb 100644
--- a/salt/elasticfleet/enabled.sls
+++ b/salt/elasticfleet/enabled.sls
@@ -27,7 +27,9 @@ wait_for_elasticsearch_elasticfleet:
 so-elastic-fleet-auto-configure-logstash-outputs:
   cmd.run:
     - name: /usr/sbin/so-elastic-fleet-outputs-update
-    - retry: True
+    - retry:
+        attempts: 4
+        interval: 30
 {% endif %}
 
 # If enabled, automatically update Fleet Server URLs & ES Connection
@@ -35,7 +37,9 @@ so-elastic-fleet-auto-configure-logstash-outputs:
 so-elastic-fleet-auto-configure-server-urls:
   cmd.run:
     - name: /usr/sbin/so-elastic-fleet-urls-update
-    - retry: True
+    - retry:
+        attempts: 4
+        interval: 30
 {% endif %}
 
 # Automatically update Fleet Server Elasticsearch URLs & Agent Artifact URLs
@@ -43,12 +47,16 @@ so-elastic-fleet-auto-configure-server-urls:
 so-elastic-fleet-auto-configure-elasticsearch-urls:
   cmd.run:
     - name: /usr/sbin/so-elastic-fleet-es-url-update
-    - retry: True
+    - retry:
+        attempts: 4
+        interval: 30
 
 so-elastic-fleet-auto-configure-artifact-urls:
   cmd.run:
     - name: /usr/sbin/so-elastic-fleet-artifacts-url-update
-    - retry: True 
+    - retry:
+        attempts: 4
+        interval: 30
 
 {% endif %}
 
diff --git a/salt/logstash/pipelines/config/so/0800_input_kafka.conf.jinja b/salt/logstash/pipelines/config/so/0800_input_kafka.conf.jinja
index 9e80456f2..33a4d39e4 100644
--- a/salt/logstash/pipelines/config/so/0800_input_kafka.conf.jinja
+++ b/salt/logstash/pipelines/config/so/0800_input_kafka.conf.jinja
@@ -1,13 +1,14 @@
 {%- set kafka_password = salt['pillar.get']('kafka:password') %}
-{%- set kafka_brokers = salt['pillar.get']('kafka:nodes', {}) %}
+{%- set kafka_brokers = salt['pillar.get']('kafka:nodes', default=None) %}
 {%- set brokers = [] %}
 
-{%- for key, values in kafka_brokers.items() %}
-{%-   if 'broker' in values['role'] %}
-{%-     do brokers.append(key ~ ':9092') %}
-{%-   endif %}
-{%- endfor %}
-{%- set bootstrap_servers = ','.join(brokers) %}
+{%- if kafka_brokers != none %}
+{%-   for key, values in kafka_brokers.items() %}
+{%-     if 'broker' in values['role'] %}
+{%-       do brokers.append(key ~ ':9092') %}
+{%-     endif %}
+{%-   endfor %}
+{%-   set bootstrap_servers = ','.join(brokers) %}
 
 input {
     kafka {
@@ -33,4 +34,5 @@ filter {
       rename => { "@metadata" => "metadata" }
     }
   }
-}
\ No newline at end of file
+}
+{% endif %}
\ No newline at end of file