diff --git a/src/main/java/com/olympus/hermione/stepSolvers/BasicAIPromptSolver.java b/src/main/java/com/olympus/hermione/stepSolvers/BasicAIPromptSolver.java
index 524d6fc..3c02d9f 100644
--- a/src/main/java/com/olympus/hermione/stepSolvers/BasicAIPromptSolver.java
+++ b/src/main/java/com/olympus/hermione/stepSolvers/BasicAIPromptSolver.java
@@ -2,6 +2,7 @@ package com.olympus.hermione.stepSolvers;
 import java.util.List;
 
 import org.slf4j.LoggerFactory;
+import org.springframework.ai.chat.client.ChatClient.CallResponseSpec;
 import org.springframework.ai.chat.messages.Message;
 import org.springframework.ai.chat.messages.SystemMessage;
 import org.springframework.ai.chat.messages.UserMessage;
@@ -56,12 +57,11 @@ public class BasicAIPromptSolver extends StepSolver {
         Message userMessage = new UserMessage(this.qai_user_input);
         Message systemMessage = new SystemMessage(this.qai_system_prompt_template);
 
-        Prompt prompt = new Prompt(List.of(userMessage, systemMessage));
-
-        List<Generation> response = chatModel.call(prompt).getResults();
-
-        String output = response.get(0).getOutput().getContent();
+        CallResponseSpec resp =  chatClient.prompt()
+                        .messages(userMessage,systemMessage)
+                        .call();
 
+        String output = resp.content();
         this.scenarioExecution.getExecSharedMap().put(this.qai_output_variable, output);
 
         this.scenarioExecution.setNextStepId(this.step.getNextStepId());