diff --git a/aio/cpu/text-to-text.yaml b/aio/cpu/text-to-text.yaml
index 8a20109d..6c4ec9e6 100644
--- a/aio/cpu/text-to-text.yaml
+++ b/aio/cpu/text-to-text.yaml
@@ -6,12 +6,14 @@ parameters:
 template:
   chat_message: |
     <|im_start|>{{if eq .RoleName "assistant"}}assistant{{else if eq .RoleName "system"}}system{{else if eq .RoleName "tool"}}tool{{else if eq .RoleName "user"}}user{{end}}
-    {{ if .FunctionCall }}<tool_call>{{end}}
-    {{ if eq .RoleName "tool" }}<tool_result>{{end}}
-    {{if .Content}}{{.Content}}{{end}}
-    {{if .FunctionCall}}{{toJson .FunctionCall}}{{end}}
-    {{ if .FunctionCall }}</tool_call>{{end}}
-    {{ if eq .RoleName "tool" }}</tool_result>{{end}}
+    {{- if .FunctionCall }}<tool_call>{{end}}
+    {{- if eq .RoleName "tool" }}<tool_result>{{end }}
+    {{- if .Content}}
+    {{.Content}}
+    {{- end }}
+    {{- if .FunctionCall}}{{toJson .FunctionCall}}{{end }}
+    {{- if .FunctionCall }}</tool_call>{{end }}
+    {{- if eq .RoleName "tool" }}</tool_result>{{end }}
     <|im_end|>
   # https://huggingface.co/NousResearch/Hermes-2-Pro-Mistral-7B-GGUF#prompt-format-for-function-calling
   function: |
@@ -27,12 +29,13 @@ template:
     For each function call return a json object with function name and arguments within <tool_call></tool_call> XML tags as follows:
     <tool_call>
     {'arguments': <args-dict>, 'name': <function-name>}
-    </tool_call><|im_end|>
-    {{.Input}}
+    </tool_call>
+    <|im_end|>
+    {{.Input -}}
     <|im_start|>assistant
     <tool_call>
   chat: |
-    {{.Input}}
+    {{.Input -}}
     <|im_start|>assistant
   completion: |
     {{.Input}}
diff --git a/aio/gpu-8g/text-to-text.yaml b/aio/gpu-8g/text-to-text.yaml
index 9502cdfe..8d5c84f7 100644
--- a/aio/gpu-8g/text-to-text.yaml
+++ b/aio/gpu-8g/text-to-text.yaml
@@ -6,12 +6,14 @@ parameters:
 template:
   chat_message: |
     <|im_start|>{{if eq .RoleName "assistant"}}assistant{{else if eq .RoleName "system"}}system{{else if eq .RoleName "tool"}}tool{{else if eq .RoleName "user"}}user{{end}}
-    {{ if .FunctionCall }}<tool_call>{{end}}
-    {{ if eq .RoleName "tool" }}<tool_result>{{end}}
-    {{if .Content}}{{.Content}}{{end}}
-    {{if .FunctionCall}}{{toJson .FunctionCall}}{{end}}
-    {{ if .FunctionCall }}</tool_call>{{end}}
-    {{ if eq .RoleName "tool" }}</tool_result>{{end}}
+    {{- if .FunctionCall }}<tool_call>{{end}}
+    {{- if eq .RoleName "tool" }}<tool_result>{{end }}
+    {{- if .Content}}
+    {{.Content}}
+    {{- end }}
+    {{- if .FunctionCall}}{{toJson .FunctionCall}}{{end }}
+    {{- if .FunctionCall }}</tool_call>{{end }}
+    {{- if eq .RoleName "tool" }}</tool_result>{{end }}
     <|im_end|>
   # https://huggingface.co/NousResearch/Hermes-2-Pro-Mistral-7B-GGUF#prompt-format-for-function-calling
   function: |
@@ -27,12 +29,13 @@ template:
     For each function call return a json object with function name and arguments within <tool_call></tool_call> XML tags as follows:
     <tool_call>
     {'arguments': <args-dict>, 'name': <function-name>}
-    </tool_call><|im_end|>
-    {{.Input}}
+    </tool_call>
+    <|im_end|>
+    {{.Input -}}
     <|im_start|>assistant
     <tool_call>
   chat: |
-    {{.Input}}
+    {{.Input -}}
     <|im_start|>assistant
   completion: |
     {{.Input}}
diff --git a/aio/intel/text-to-text.yaml b/aio/intel/text-to-text.yaml
index d2316745..a7cb5b4d 100644
--- a/aio/intel/text-to-text.yaml
+++ b/aio/intel/text-to-text.yaml
@@ -7,12 +7,14 @@ parameters:
 template:
   chat_message: |
     <|im_start|>{{if eq .RoleName "assistant"}}assistant{{else if eq .RoleName "system"}}system{{else if eq .RoleName "tool"}}tool{{else if eq .RoleName "user"}}user{{end}}
-    {{ if .FunctionCall }}<tool_call>{{end}}
-    {{ if eq .RoleName "tool" }}<tool_result>{{end}}
-    {{if .Content}}{{.Content}}{{end}}
-    {{if .FunctionCall}}{{toJson .FunctionCall}}{{end}}
-    {{ if .FunctionCall }}</tool_call>{{end}}
-    {{ if eq .RoleName "tool" }}</tool_result>{{end}}
+    {{- if .FunctionCall }}<tool_call>{{end}}
+    {{- if eq .RoleName "tool" }}<tool_result>{{end }}
+    {{- if .Content}}
+    {{.Content}}
+    {{- end }}
+    {{- if .FunctionCall}}{{toJson .FunctionCall}}{{end }}
+    {{- if .FunctionCall }}</tool_call>{{end }}
+    {{- if eq .RoleName "tool" }}</tool_result>{{end }}
     <|im_end|>
   # https://huggingface.co/NousResearch/Hermes-2-Pro-Mistral-7B-GGUF#prompt-format-for-function-calling
   function: |
@@ -28,12 +30,13 @@ template:
     For each function call return a json object with function name and arguments within <tool_call></tool_call> XML tags as follows:
     <tool_call>
     {'arguments': <args-dict>, 'name': <function-name>}
-    </tool_call><|im_end|>
-    {{.Input}}
+    </tool_call>
+    <|im_end|>
+    {{.Input -}}
     <|im_start|>assistant
     <tool_call>
   chat: |
-    {{.Input}}
+    {{.Input -}}
     <|im_start|>assistant
   completion: |
     {{.Input}}
diff --git a/embedded/models/hermes-2-pro-mistral.yaml b/embedded/models/hermes-2-pro-mistral.yaml
index eb75b97c..7bfa9418 100644
--- a/embedded/models/hermes-2-pro-mistral.yaml
+++ b/embedded/models/hermes-2-pro-mistral.yaml
@@ -6,12 +6,14 @@ parameters:
 template:
   chat_message: |
     <|im_start|>{{if eq .RoleName "assistant"}}assistant{{else if eq .RoleName "system"}}system{{else if eq .RoleName "tool"}}tool{{else if eq .RoleName "user"}}user{{end}}
-    {{ if .FunctionCall }}<tool_call>{{end}}
-    {{ if eq .RoleName "tool" }}<tool_result>{{end}}
-    {{if .Content}}{{.Content}}{{end}}
-    {{if .FunctionCall}}{{toJson .FunctionCall}}{{end}}
-    {{ if .FunctionCall }}</tool_call>{{end}}
-    {{ if eq .RoleName "tool" }}</tool_result>{{end}}
+    {{- if .FunctionCall }}<tool_call>{{end}}
+    {{- if eq .RoleName "tool" }}<tool_result>{{end }}
+    {{- if .Content}}
+    {{.Content}}
+    {{- end }}
+    {{- if .FunctionCall}}{{toJson .FunctionCall}}{{end }}
+    {{- if .FunctionCall }}</tool_call>{{end }}
+    {{- if eq .RoleName "tool" }}</tool_result>{{end }}
     <|im_end|>
   # https://huggingface.co/NousResearch/Hermes-2-Pro-Mistral-7B-GGUF#prompt-format-for-function-calling
   function: |
@@ -27,12 +29,13 @@ template:
     For each function call return a json object with function name and arguments within <tool_call></tool_call> XML tags as follows:
     <tool_call>
     {'arguments': <args-dict>, 'name': <function-name>}
-    </tool_call><|im_end|>
-    {{.Input}}
+    </tool_call>
+    <|im_end|>
+    {{.Input -}}
     <|im_start|>assistant
     <tool_call>
   chat: |
-    {{.Input}}
+    {{.Input -}}
     <|im_start|>assistant
   completion: |
     {{.Input}}