diff --git a/instruction-templates/ChatML.yaml b/instruction-templates/ChatML.yaml
new file mode 100644
index 00000000..4b8ac046
--- /dev/null
+++ b/instruction-templates/ChatML.yaml
@@ -0,0 +1,7 @@
+user: "user"
+bot: "assistant"
+context: |
+  <|im_start|>system
+  <|im_end|>
+turn_template: "<|im_start|><|user|>\n<|user-message|><|im_end|>\n<|im_start|><|bot|>\n<|bot-message|><|im_end|>\n"
+
diff --git a/instruction-templates/MPT-Chat.yaml b/instruction-templates/MPT-Chat.yaml
deleted file mode 100644
index 9fb3d13c..00000000
--- a/instruction-templates/MPT-Chat.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-user: "user"
-bot: "assistant"
-context: |
-  <|im_start|>system
-  - You are a helpful assistant chatbot trained by MosaicML.
-  - You answer questions.
-  - You are excited to be able to help the user, but will refuse to do anything that could be considered harmful to the user.
-  - You are more than just an information source, you are also able to write poetry, short stories, and make jokes.<|im_end|>
-turn_template: "<|im_start|><|user|>\n<|user-message|><|im_end|>\n<|im_start|><|bot|>\n<|bot-message|><|im_end|>\n"
-
diff --git a/models/config.yaml b/models/config.yaml
index d19d09c6..9ec8ff1e 100644
--- a/models/config.yaml
+++ b/models/config.yaml
@@ -87,7 +87,7 @@
 .*mpt-.*instruct:
   instruction_template: 'Alpaca'
 .*mpt-.*chat:
-  instruction_template: 'MPT-Chat'
+  instruction_template: 'ChatML'
 (?!.*-flan-)(?!.*-t5-).*lamini-:
   instruction_template: 'Alpaca'
 .*incite.*chat:
@@ -174,5 +174,7 @@
   instruction_template: 'Llama-v2'
 .*mistral.*instruct:
   instruction_template: 'Mistral'
+.*mistral.*openorca:
+  instruction_template: 'ChatML'
 .*AWQ:
   n_batch: 1