diff --git a/src/Infrastructure/BotSharp.Core/Instructs/InstructService.cs b/src/Infrastructure/BotSharp.Core/Instructs/InstructService.cs
index d8a9a1bb..50bd83f1 100644
--- a/src/Infrastructure/BotSharp.Core/Instructs/InstructService.cs
+++ b/src/Infrastructure/BotSharp.Core/Instructs/InstructService.cs
@@ -79,6 +79,12 @@ public partial class InstructService : IInstructService
         }
         else if (completer is IChatCompletion chatCompleter)
         {
+            if (instruction == "#TEMPLATE#")
+            {
+                instruction = prompt;
+                prompt = message.Content;
+            }
+
             var result = await chatCompleter.GetChatCompletions(new Agent
             {
                 Id = agentId,