diff --git a/salt/logstash/defaults.yaml b/salt/logstash/defaults.yaml
index 8d27730b2..574a4f826 100644
--- a/salt/logstash/defaults.yaml
+++ b/salt/logstash/defaults.yaml
@@ -22,15 +22,16 @@ logstash:
   defined_pipelines:
     fleet:
       - so/0012_input_elastic_agent.conf     
-      - so/9806_output_http_fleet.conf.jinja
+      - so/9806_output_lumberjack_fleet.conf.jinja
     manager:
       - so/0011_input_endgame.conf
       - so/0012_input_elastic_agent.conf
-      - so/0013_input_http_fleet.conf
+      - so/0013_input_lumberjack_fleet.conf
       - so/9999_output_redis.conf.jinja        
     receiver:
       - so/0011_input_endgame.conf
       - so/0012_input_elastic_agent.conf
+      - so/0013_input_lumberjack_fleet.conf
       - so/9999_output_redis.conf.jinja
     search:
       - so/0900_input_redis.conf.jinja
diff --git a/salt/logstash/enabled.sls b/salt/logstash/enabled.sls
index 595297510..a88e97b19 100644
--- a/salt/logstash/enabled.sls
+++ b/salt/logstash/enabled.sls
@@ -62,7 +62,7 @@ so-logstash:
       - /etc/pki/elasticfleet-logstash.crt:/usr/share/logstash/elasticfleet-logstash.crt:ro
       - /etc/pki/elasticfleet-logstash.key:/usr/share/logstash/elasticfleet-logstash.key:ro
       - /etc/pki/elasticfleet-lumberjack.crt:/usr/share/logstash/elasticfleet-lumberjack.crt:ro
-      - /etc/pki/elasticfleet-lumberjack.p8:/usr/share/logstash/elasticfleet-lumberjack.key:ro
+      - /etc/pki/elasticfleet-lumberjack.key:/usr/share/logstash/elasticfleet-lumberjack.key:ro
       {% endif %}
       {% if GLOBALS.role in ['so-manager', 'so-managersearch', 'so-standalone', 'so-import'] %}
       - /etc/pki/ca.crt:/usr/share/filebeat/ca.crt:ro
diff --git a/salt/logstash/pipelines/config/so/0013_input_http_fleet.conf b/salt/logstash/pipelines/config/so/0013_input_lumberjack_fleet.conf
similarity index 100%
rename from salt/logstash/pipelines/config/so/0013_input_http_fleet.conf
rename to salt/logstash/pipelines/config/so/0013_input_lumberjack_fleet.conf
diff --git a/salt/logstash/pipelines/config/so/9806_output_http_fleet.conf.jinja b/salt/logstash/pipelines/config/so/9806_output_lumberjack_fleet.conf.jinja
similarity index 100%
rename from salt/logstash/pipelines/config/so/9806_output_http_fleet.conf.jinja
rename to salt/logstash/pipelines/config/so/9806_output_lumberjack_fleet.conf.jinja
diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls
index f51c51039..97e971b83 100644
--- a/salt/ssl/init.sls
+++ b/salt/ssl/init.sls
@@ -186,7 +186,9 @@ chownelasticfleetkey:
     - user: 947
     - group: 939
 # End -- Elastic Fleet Host Cert
+{% endif %} # endif is for not including HeavyNodes & Receivers 
 
+{% if grains['role'] not in [ 'so-heavynode'] %}
 # Start -- Elastic Fleet Logstash Input Cert
 etc_elasticfleet_logstash_key:
   x509.private_key_managed:
@@ -220,7 +222,7 @@ etc_elasticfleet_logstash_crt:
   cmd.run:
     - name: "/usr/bin/openssl pkcs8 -in /etc/pki/elasticfleet-logstash.key -topk8 -out /etc/pki/elasticfleet-logstash.p8 -nocrypt"
     - onchanges:
-      - x509: etc_elasticfleet_key
+      - x509: etc_elasticfleet_logstash_key
 
 eflogstashperms:
   file.managed:
@@ -245,7 +247,7 @@ chownelasticfleetlogstashkey:
     - user: 931
     - group: 939
 # End -- Elastic Fleet Logstash Input Cert
-{% endif %} # endif is for not including HeavyNodes & Receivers 
+{% endif %} # endif is for not including HeavyNodes 
 
 # Start -- Elastic Fleet Node - Logstash Lumberjack Input / Output
 # Cert needed on: Managers, Receivers