diff --git a/library/modelfiles/nous-hermes b/library/modelfiles/nous-hermes
index afa3d6ae..1360b943 100644
--- a/library/modelfiles/nous-hermes
+++ b/library/modelfiles/nous-hermes
@@ -1,5 +1,5 @@
 FROM ../models/nous-hermes-13b.ggmlv3.q4_0.bin
-PROMPT """
+TEMPLATE """
 ### Instruction:
 {{ .Prompt }}
 
diff --git a/library/modelfiles/orca b/library/modelfiles/orca
index 52585270..cb97af01 100644
--- a/library/modelfiles/orca
+++ b/library/modelfiles/orca
@@ -1,8 +1,8 @@
 FROM ../models/orca-mini-3b.ggmlv3.q4_0.bin
-PROMPT """
-{{- if not .Context }}
+TEMPLATE """
+{{- if .First }}
 ### System:
-You are an AI assistant that follows instruction extremely well. Help as much as you can.
+{{ .System }}
 {{- end }}
 
 ### User:
@@ -10,3 +10,5 @@ You are an AI assistant that follows instruction extremely well. Help as much as
 
 ### Response:
 """
+
+SYSTEM """You are an AI assistant that follows instruction extremely well. Help as much as you can."""
diff --git a/library/modelfiles/vicuna b/library/modelfiles/vicuna
index 7eba5786..2afc6846 100644
--- a/library/modelfiles/vicuna
+++ b/library/modelfiles/vicuna
@@ -1,9 +1,11 @@
 FROM ../models/vicuna-7b-v1.3.ggmlv3.q4_0.bin
-PROMPT """
-{{ if not .Context }}
-A chat between a curious user and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the user's questions.
+TEMPLATE """
+{{ if .First }}
+{{ .System }}
 {{- end }}
 
 USER: {{ .Prompt }}
 ASSISTANT:
 """
+
+SYSTEM """A chat between a curious user and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the user's questions."""
diff --git a/library/modelfiles/wizard-vicuna b/library/modelfiles/wizard-vicuna
index 16c79c3a..28a94815 100644
--- a/library/modelfiles/wizard-vicuna
+++ b/library/modelfiles/wizard-vicuna
@@ -1,5 +1,5 @@
 FROM ../models/Wizard-Vicuna-13B-Uncensored.ggmlv3.q4_0.bin
-PROMPT """
+TEMPLATE """
 USER: {{ .Prompt }}
 ASSISTANT:
 """