diff --git a/salt/elasticfleet/install_agent_grid.sls b/salt/elasticfleet/install_agent_grid.sls
index 482af2e1e..5201eddf2 100644
--- a/salt/elasticfleet/install_agent_grid.sls
+++ b/salt/elasticfleet/install_agent_grid.sls
@@ -14,20 +14,23 @@
 
 pull_agent_installer:
   file.managed:
-    - name: /opt/so/so-elastic-agent_linux_amd64
+    - name: /opt/so/log/agents/so-elastic-agent_linux_amd64
     - source: salt://elasticfleet/files/so_agent-installers/so-elastic-agent_linux_amd64
     - mode: 755
     - makedirs: True
 
 run_installer:
   cmd.run:
-    - name: ./so-elastic-agent_linux_amd64 -token={{ GRIDNODETOKEN }} -force
-    - cwd: /opt/so
+    {# Run agent installer and wait for it to report healthy status #}
+    - name: ./so-elastic-agent_linux_amd64 -token={{ GRIDNODETOKEN }} -force -verify
+    - cwd: /opt/so/log/agents
     - retry:
         attempts: 3
         interval: 20
+    - require:
+      - file: pull_agent_installer
 
 cleanup_agent_installer:
   file.absent:
-    - name: /opt/so/so-elastic-agent_linux_amd64
+    - name: /opt/so/log/agents/so-elastic-agent_linux_amd64
 {% endif %}