diff --git a/salt/elasticfleet/tools/sbin/so-elastic-fleet-common b/salt/elasticfleet/tools/sbin/so-elastic-fleet-common
index 5d8781ba8..4ca5030aa 100644
--- a/salt/elasticfleet/tools/sbin/so-elastic-fleet-common
+++ b/salt/elasticfleet/tools/sbin/so-elastic-fleet-common
@@ -142,7 +142,7 @@ elastic_fleet_installed_packages() {
 }
 
 elastic_fleet_agent_policy_ids() {
-    if output=$(fleet_api "agent_policies");
+    if output=$(fleet_api "agent_policies"); then
         echo "$output" | jq -r .items[].id
     else
         echo "Error: Failed to retrieve agent policies."
diff --git a/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-setup b/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-setup
index 066edd2da..9033d7a0c 100755
--- a/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-setup
+++ b/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-setup
@@ -50,7 +50,7 @@ if [[ "$RETURN_CODE" != "0" ]]; then
 fi
 
 printf "\n### Create ES Token ###\n"
-if ESTOKEN_RAW=$(fleet_api "service_tokens" -XPOST-H 'kbn-xsrf: true' -H 'Content-Type: application/json'); then
+if ESTOKEN_RAW=$(fleet_api "service_tokens" -XPOST -H 'kbn-xsrf: true' -H 'Content-Type: application/json'); then
     ESTOKEN=$(echo "$ESTOKEN_RAW" | jq -r .value)
 else
     echo -e "\nFailed to create ES token..."