diff --git a/salt/soc/defaults.yaml b/salt/soc/defaults.yaml
index e0e61df48..d38e7a246 100644
--- a/salt/soc/defaults.yaml
+++ b/salt/soc/defaults.yaml
@@ -1552,6 +1552,8 @@ soc:
           reconcileModel: gemma@SOAI
           memoryPersona: ""
           reconcilePersona: ""
+          toolUseTurnAttempts: 12
+          toolUseTurnDelayMs: 175
         onionconfig:
           saltstackDir: /opt/so/saltstack
           bypassEnabled: false
diff --git a/salt/soc/soc_soc.yaml b/salt/soc/soc_soc.yaml
index 53dedb4e3..9f737f96a 100644
--- a/salt/soc/soc_soc.yaml
+++ b/salt/soc/soc_soc.yaml
@@ -900,6 +900,14 @@ soc:
             global: True
             readonlyUi: True
             multiline: True
+          toolUseTurnAttempts:
+            description: Number of times the API will retry looking up a tool request that has finished streaming but has not yet been saved to the database. Each retry waits toolUseTurnDelayMs before checking again. If tool auto-approval fails intermittently, increasing this value gives the message more time to be saved.
+            global: True
+            advanced: True
+          toolUseTurnDelayMs:
+            description: Milliseconds to wait between attempts to look up a tool request that has finished streaming but has not yet been saved to the database. The API retries up to toolUseTurnAttempts times, so this value times the attempt count is the maximum wait before auto-approval fails. Increase it if tool auto-approval fails intermittently.
+            global: True
+            advanced: True
       client:
         assistant:
           enabled: