diff --git a/salt/elastic-fleet/init.sls b/salt/elastic-fleet/init.sls
index a4b8fbf3d..6059da3cb 100644
--- a/salt/elastic-fleet/init.sls
+++ b/salt/elastic-fleet/init.sls
@@ -15,17 +15,12 @@ elasticfleetdir:
     - name: /opt/so/conf/elastic-fleet/state
     - makedirs: True
 
-elasticagentinstallersdir:
-  file.directory:
-    - name: /opt/so/conf/elastic-fleet/so_agent-installers
-    - makedirs: True
-
   {% if SERVICETOKEN != '' %}
 so-elastic-fleet:
   docker_container.running:
     - image: docker.elastic.co/beats/elastic-agent:8.4.1
     - name: so-elastic-fleet
-    - hostname: elastic-fleet-{{ GLOBALS.hostname }}
+    - hostname: Fleet-{{ GLOBALS.hostname }}
     - detach: True
     - user: root
     - extra_hosts:
diff --git a/salt/kibana/defaults.yaml b/salt/kibana/defaults.yaml
index 637e80cf7..2e9869c4e 100644
--- a/salt/kibana/defaults.yaml
+++ b/salt/kibana/defaults.yaml
@@ -47,6 +47,7 @@ kibana:
           - name: SO-Manager
             id: so-manager
             description: "SO Manager Fleet Server Policy"
+            is_managed: true
             namespace: default
             is_default_fleet_server: true
             monitoring_enabled: ['logs']
@@ -58,6 +59,7 @@ kibana:
             id: so-grid-nodes
             description: "SO Grid Node Policy"
             namespace: default
+            is_managed: true
             monitoring_enabled: ['logs']
             package_policies:
               - name: osquery-grid-nodes
@@ -72,6 +74,7 @@ kibana:
           - name: Endpoints-Initial
             id: endpoints-default
             description: "Initial Endpoint Policy"
+            is_managed: true
             namespace: default
             monitoring_enabled: ['logs']
             package_policies:
diff --git a/salt/nginx/init.sls b/salt/nginx/init.sls
index 72386561b..f5791fdd6 100644
--- a/salt/nginx/init.sls
+++ b/salt/nginx/init.sls
@@ -92,7 +92,7 @@ so-nginx:
       - /opt/so/log/nginx/:/var/log/nginx:rw
       - /opt/so/tmp/nginx/:/var/lib/nginx:rw
       - /opt/so/tmp/nginx/:/run:rw
-      - /opt/so/conf/elastic-fleet/so_agent-installers:/opt/socore/html/packages
+      - /opt/so/saltstack/local/salt/elastic-fleet/files/so_agent-installers/:/opt/socore/html/packages
   {% if grains.role in ['so-manager', 'so-managersearch', 'so-eval', 'so-standalone', 'so-import'] %}
       - /etc/pki/managerssl.crt:/etc/pki/nginx/server.crt:ro
       - /etc/pki/managerssl.key:/etc/pki/nginx/server.key:ro