diff --git a/templates/components.jsonnet b/templates/components.jsonnet
index f27be5cd..23681ac4 100644
--- a/templates/components.jsonnet
+++ b/templates/components.jsonnet
@@ -16,12 +16,15 @@
    "ollama": import "components/ollama.jsonnet",
    "openai": import "components/openai.jsonnet",
    "override-recursive-chunker": import "components/chunker-recursive.jsonnet",
+
+   "prompt-overrides": import "components/prompt-overrides.jsonnet",
+
    "prompt-template-definitions": import "components/null.jsonnet",
    "prompt-template-document-query": import "components/null.jsonnet",
    "prompt-template-kq-query": import "components/null.jsonnet",
    "prompt-template-relationships": import "components/null.jsonnet",
    "prompt-template-rows-template": import "components/null.jsonnet",
-   "prompt-generic": import "components/prompt-generic.jsonnet",
+//   "prompt-generic": import "components/prompt-generic.jsonnet",
    "prompt-template": import "components/prompt-template.jsonnet",
    "pulsar": import "components/pulsar.jsonnet",
    "pulsar-manager": import "components/pulsar-manager.jsonnet",
diff --git a/templates/components/prompt-overrides.jsonnet b/templates/components/prompt-overrides.jsonnet
new file mode 100644
index 00000000..de02d82a
--- /dev/null
+++ b/templates/components/prompt-overrides.jsonnet
@@ -0,0 +1,28 @@
+local base = import "base/base.jsonnet";
+local images = import "values/images.jsonnet";
+local url = import "values/url.jsonnet";
+local prompts = import "prompts/mixtral.jsonnet";
+local default_prompts = import "prompts/default-prompts.jsonnet";
+
+{
+
+    with:: function(key, value)
+        if (key == "system-template") then
+            self + {
+                prompts +:: {
+                    "system-template": value,
+                }
+            }
+        else
+            self + {
+                prompts +:: {
+                    templates +:: {
+                        [key]: {
+                            prompt +:: value
+                        }
+                    }
+                }
+            },
+
+} + default_prompts
+