diff --git a/salt/manager/init.sls b/salt/manager/init.sls
index cbe3455fe..23ef189b5 100644
--- a/salt/manager/init.sls
+++ b/salt/manager/init.sls
@@ -61,6 +61,8 @@ manager_sbin:
     - user: 939
     - group: 939
     - file_mode: 755
+    - exclude_pat: 
+      - "*_test.py"
 
 yara_update_scripts:
   file.recurse:
diff --git a/salt/manager/tools/sbin_jinja/so-elastic-fleet-reset b/salt/manager/tools/sbin_jinja/so-elastic-fleet-reset
index 5a7be9e60..203b2e76e 100644
--- a/salt/manager/tools/sbin_jinja/so-elastic-fleet-reset
+++ b/salt/manager/tools/sbin_jinja/so-elastic-fleet-reset
@@ -29,7 +29,7 @@ status "Stopping Fleet Container..."
 so-elastic-fleet-stop --force
 
 status "Deleting Fleet Data from Pillars..."
-sed -i -z "s/elasticfleet:.*grid_enrollment_heavy.*'//" /opt/so/saltstack/local/pillar/minions/{{ GLOBALS.minion_id }}.sls
+so-yaml.py remove /opt/so/saltstack/local/pillar/minions/{{ GLOBALS.minion_id }}.sls elasticfleet
 sed -i "/fleet_grid_enrollment_token_general.*/d" /opt/so/saltstack/local/pillar/global/soc_global.sls
 sed -i "/fleet_grid_enrollment_token_heavy.*/d" /opt/so/saltstack/local/pillar/global/soc_global.sls