diff --git a/.gitignore b/.gitignore
index 461eef9d2..38b9bbc9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,9 @@ pids
 *.seed
 .git
 
+# CI/CD data
+test-image*
+
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
 
diff --git a/api/server/controllers/agents/client.js b/api/server/controllers/agents/client.js
index 7a6d0cce1..4f4b84d53 100644
--- a/api/server/controllers/agents/client.js
+++ b/api/server/controllers/agents/client.js
@@ -1122,17 +1122,14 @@ class AgentClient extends BaseClient {
       clientOptions.configuration = options.configOptions;
     }
 
-    // Ensure maxTokens is set for non-o1 models
-    if (!/\b(o\d)\b/i.test(clientOptions.model) && !clientOptions.maxTokens) {
+    const shouldRemoveMaxTokens = /\b(o\d|gpt-[5-9])\b/i.test(clientOptions.model);
+    if (shouldRemoveMaxTokens && clientOptions.maxTokens != null) {
+      delete clientOptions.maxTokens;
+    } else if (!shouldRemoveMaxTokens && !clientOptions.maxTokens) {
       clientOptions.maxTokens = 75;
-    } else if (/\b(o\d)\b/i.test(clientOptions.model) && clientOptions.maxTokens != null) {
-      delete clientOptions.maxTokens;
     }
-
-    if (/\bgpt-[5-9]\b/i.test(clientOptions.model) && clientOptions.maxTokens != null) {
-      clientOptions.modelKwargs = clientOptions.modelKwargs ?? {};
-      clientOptions.modelKwargs.max_completion_tokens = clientOptions.maxTokens;
-      delete clientOptions.maxTokens;
+    if (shouldRemoveMaxTokens && clientOptions?.modelKwargs?.max_completion_tokens != null) {
+      delete clientOptions.modelKwargs.max_completion_tokens;
     }
 
     clientOptions = Object.assign(