diff --git a/salt/elasticfleet/init.sls b/salt/elasticfleet/init.sls
index ad0f62edd..da735ffac 100644
--- a/salt/elasticfleet/init.sls
+++ b/salt/elasticfleet/init.sls
@@ -39,23 +39,6 @@ eastatedir:
     - group: 939
     - makedirs: True
 
-# Pull down the Logstash Cert from the Manager
-/opt/so/conf/elastic-fleet/certs/elasticfleet-logstash.p8:
-  file.managed:
-    - replace: True
-    - source: salt://elasticfleet/files/certs/elasticfleet-logstash.p8
-    - mode: 640
-    - user: 931
-    - group: 939
-
-/opt/so/conf/elastic-fleet/certs/elasticfleet-logstash.crt:
-  file.managed:
-    - replace: True
-    - source: salt://elasticfleet/files/certs/elasticfleet-logstash.crt
-    - mode: 640
-    - user: 931
-    - group: 939
-
 
   {% if SERVICETOKEN != '' %}
 so-elastic-fleet:
diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls
index 3e6ce0512..5f7eb90df 100644
--- a/salt/ssl/init.sls
+++ b/salt/ssl/init.sls
@@ -330,6 +330,7 @@ eflogstashcrtlink:
   file.managed:
     - replace: True
     - source: salt://elasticfleet/files/certs/elasticfleet-logstash.p8
+    - makedirs: True
     - mode: 640
     - user: 931
     - group: 939
@@ -338,6 +339,7 @@ eflogstashcrtlink:
   file.managed:
     - replace: True
     - source: salt://elasticfleet/files/certs/elasticfleet-logstash.crt
+    - makedirs: True
     - mode: 640
     - user: 931
     - group: 939