diff --git a/dotCMS/src/main/java/com/dotcms/ai/client/langchain4j/AzureOpenAiModelProviderStrategy.java b/dotCMS/src/main/java/com/dotcms/ai/client/langchain4j/AzureOpenAiModelProviderStrategy.java
index d1b2f4c762f6..f62919ba239c 100644
--- a/dotCMS/src/main/java/com/dotcms/ai/client/langchain4j/AzureOpenAiModelProviderStrategy.java
+++ b/dotCMS/src/main/java/com/dotcms/ai/client/langchain4j/AzureOpenAiModelProviderStrategy.java
@@ -27,11 +27,12 @@ public ChatModel buildChatModel(final ProviderConfig config, final String modelT
                 .apiKey(config.apiKey())
                 .endpoint(config.endpoint())
                 .deploymentName(deploymentName(config));
-        if (config.apiVersion() != null) builder.serviceVersion(config.apiVersion());
-        if (config.maxRetries() != null) builder.maxRetries(config.maxRetries());
-        if (config.timeout() != null) builder.timeout(Duration.ofSeconds(config.timeout()));
-        if (config.temperature() != null) builder.temperature(config.temperature());
-        if (config.maxTokens() != null && !requiresCompletionTokens(config)) builder.maxTokens(config.maxTokens());
+        if (config.apiVersion() != null) { builder.serviceVersion(config.apiVersion()); }
+        if (config.maxRetries() != null) { builder.maxRetries(config.maxRetries()); }
+        if (config.timeout() != null) { builder.timeout(Duration.ofSeconds(config.timeout())); }
+        if (config.temperature() != null) { builder.temperature(config.temperature()); }
+        if (config.maxTokens() != null && !requiresCompletionTokens(config)) { builder.maxTokens(config.maxTokens()); }
+        if (config.maxCompletionTokens() != null && requiresCompletionTokens(config)) { builder.maxCompletionTokens(config.maxCompletionTokens()); }
         return builder.build();
     }
 
@@ -42,11 +43,12 @@ public StreamingChatModel buildStreamingChatModel(final ProviderConfig config, f
                 .apiKey(config.apiKey())
                 .endpoint(config.endpoint())
                 .deploymentName(deploymentName(config));
-        if (config.apiVersion() != null) builder.serviceVersion(config.apiVersion());
-        if (config.maxRetries() != null) builder.maxRetries(config.maxRetries());
-        if (config.timeout() != null) builder.timeout(Duration.ofSeconds(config.timeout()));
-        if (config.temperature() != null) builder.temperature(config.temperature());
-        if (config.maxTokens() != null && !requiresCompletionTokens(config)) builder.maxTokens(config.maxTokens());
+        if (config.apiVersion() != null) { builder.serviceVersion(config.apiVersion()); }
+        if (config.maxRetries() != null) { builder.maxRetries(config.maxRetries()); }
+        if (config.timeout() != null) { builder.timeout(Duration.ofSeconds(config.timeout())); }
+        if (config.temperature() != null) { builder.temperature(config.temperature()); }
+        if (config.maxTokens() != null && !requiresCompletionTokens(config)) { builder.maxTokens(config.maxTokens()); }
+        if (config.maxCompletionTokens() != null && requiresCompletionTokens(config)) { builder.maxCompletionTokens(config.maxCompletionTokens()); }
         return builder.build();
     }
 
@@ -57,10 +59,10 @@ public EmbeddingModel buildEmbeddingModel(final ProviderConfig config, final Str
                 .apiKey(config.apiKey())
                 .endpoint(config.endpoint())
                 .deploymentName(deploymentName(config));
-        if (config.apiVersion() != null) builder.serviceVersion(config.apiVersion());
-        if (config.maxRetries() != null) builder.maxRetries(config.maxRetries());
-        if (config.timeout() != null) builder.timeout(Duration.ofSeconds(config.timeout()));
-        if (config.dimensions() != null) builder.dimensions(config.dimensions());
+        if (config.apiVersion() != null) { builder.serviceVersion(config.apiVersion()); }
+        if (config.maxRetries() != null) { builder.maxRetries(config.maxRetries()); }
+        if (config.timeout() != null) { builder.timeout(Duration.ofSeconds(config.timeout())); }
+        if (config.dimensions() != null) { builder.dimensions(config.dimensions()); }
         return builder.build();
     }
 
@@ -94,9 +96,9 @@ public ImageModel buildImageModel(final ProviderConfig config, final String mode
                     .baseUrl(config.endpoint())
                     .apiKey(config.apiKey())
                     .modelName(deploymentName(config));
-            if (config.size() != null) builder.size(config.size());
-            if (config.timeout() != null) builder.timeout(Duration.ofSeconds(config.timeout()));
-            if (config.maxRetries() != null) builder.maxRetries(config.maxRetries());
+            if (config.size() != null) { builder.size(config.size()); }
+            if (config.timeout() != null) { builder.timeout(Duration.ofSeconds(config.timeout())); }
+            if (config.maxRetries() != null) { builder.maxRetries(config.maxRetries()); }
             return builder.build();
         }
         final OpenAiOfficialImageModel.Builder builder = OpenAiOfficialImageModel.builder()
@@ -108,9 +110,9 @@ public ImageModel buildImageModel(final ProviderConfig config, final String mode
         if (config.apiVersion() != null) {
             builder.azureOpenAIServiceVersion(AzureOpenAIServiceVersion.Companion.fromString(config.apiVersion()));
         }
-        if (config.size() != null) builder.size(config.size());
-        if (config.timeout() != null) builder.timeout(Duration.ofSeconds(config.timeout()));
-        if (config.maxRetries() != null) builder.maxRetries(config.maxRetries());
+        if (config.size() != null) { builder.size(config.size()); }
+        if (config.timeout() != null) { builder.timeout(Duration.ofSeconds(config.timeout())); }
+        if (config.maxRetries() != null) { builder.maxRetries(config.maxRetries()); }
         return builder.build();
     }