diff --git a/src/axolotl/prompt_strategies/chat_template.py b/src/axolotl/prompt_strategies/chat_template.py
index 0946a4b8c7..0b172d66b9 100644
--- a/src/axolotl/prompt_strategies/chat_template.py
+++ b/src/axolotl/prompt_strategies/chat_template.py
@@ -41,6 +41,7 @@ def __init__(
                 "assistant": "assistant",
                 "gpt": "assistant",
                 "system": "system",
+                "tool": "tool",
             }
         self.message_field_role = message_field_role
         self.message_field_content = message_field_content
@@ -58,6 +59,8 @@ def build_prompt(self, conversation, add_generation_prompt=False, images=None):
                 "role": self.roles[t[self.message_field_role]],
                 "content": t[self.message_field_content],
                 "training": t.get(self.message_field_training, None),
+                "tool_calls": t.get("tool_calls", None),
+                "name": t.get("name", None),
             }
             for t in conversation
         ]