diff --git a/instruction-templates/ChatML.yaml b/instruction-templates/ChatML.yaml
index 5197855d..9ea2b9c9 100644
--- a/instruction-templates/ChatML.yaml
+++ b/instruction-templates/ChatML.yaml
@@ -1,7 +1,6 @@
-user: "user"
-bot: "assistant"
+user: user
+bot: assistant
+turn_template: <|im_start|><|user|>\n<|user-message|><|im_end|>\n<|im_start|><|bot|>\n<|bot-message|><|im_end|>\n
 context: |
-  <|im_start|><|system-message|>
-  <|im_end|>
-turn_template: "<|im_start|><|user|>\n<|user-message|><|im_end|>\n<|im_start|><|bot|>\n<|bot-message|><|im_end|>\n"
-system_message: "system"
+  <|im_start|>system
+  <|system-message|><|im_end|>
diff --git a/models/config.yaml b/models/config.yaml
index 00db01d1..b39e0eb4 100644
--- a/models/config.yaml
+++ b/models/config.yaml
@@ -180,3 +180,5 @@
   instruction_template: 'ChatML'
 .*(WizardCoder-Python-34B-V1.0|Phind-CodeLlama-34B-v2|CodeBooga-34B-v0.1):
   instruction_template: 'Alpaca'
+.*orca-2-(13|7)b:
+  instruction_template: 'ChatML'