diff --git a/templates/components/azure-openai-rag.jsonnet b/templates/components/azure-openai-rag.jsonnet
index 54282ecf..fab83266 100644
--- a/templates/components/azure-openai-rag.jsonnet
+++ b/templates/components/azure-openai-rag.jsonnet
@@ -14,7 +14,7 @@ local prompts = import "prompts/mixtral.jsonnet";
     "azure-openai-rag-max-output-tokens":: 4192,
     "azure-openai-rag-temperature":: 0.0,
 
-    "text-completion" +: {
+    "text-completion-rag" +: {
     
         create:: function(engine)
 
diff --git a/templates/components/claude-rag.jsonnet b/templates/components/claude-rag.jsonnet
index 2091251d..9dcc7615 100644
--- a/templates/components/claude-rag.jsonnet
+++ b/templates/components/claude-rag.jsonnet
@@ -13,7 +13,7 @@ local prompts = import "prompts/mixtral.jsonnet";
     "claude-rag-max-output-tokens":: 4096,
     "claude-rag-temperature":: 0.0,
 
-    "text-completion" +: {
+    "text-completion-rag" +: {
     
         create:: function(engine)
 
diff --git a/templates/components/cohere-rag.jsonnet b/templates/components/cohere-rag.jsonnet
index 50308794..62829445 100644
--- a/templates/components/cohere-rag.jsonnet
+++ b/templates/components/cohere-rag.jsonnet
@@ -12,7 +12,7 @@ local prompts = import "prompts/mixtral.jsonnet";
 
     "cohere-rag-temperature":: 0.0,
 
-    "text-completion" +: {
+    "text-completion-rag" +: {
     
         create:: function(engine)
 
diff --git a/templates/components/googleaistudio-rag.jsonnet b/templates/components/googleaistudio-rag.jsonnet
index 116ce831..3bfa9618 100644
--- a/templates/components/googleaistudio-rag.jsonnet
+++ b/templates/components/googleaistudio-rag.jsonnet
@@ -14,7 +14,7 @@ local prompts = import "prompts/mixtral.jsonnet";
     "googleaistudio-rag-temperature":: 0.0,
     "googleaistudio-rag-model":: "gemini-1.5-flash-002",
 
-    "text-completion" +: {
+    "text-completion-rag" +: {
     
         create:: function(engine)
 
diff --git a/templates/generate-all b/templates/generate-all
index 1ae71402..22c9a5b0 100755
--- a/templates/generate-all
+++ b/templates/generate-all
@@ -87,8 +87,18 @@ def full_config_object(
 ):
 
     return config_object([
-        graph_store, "pulsar", vector_store, embeddings,
-        "graph-rag", "grafana", "trustgraph", llm, "workbench-ui",
+        "triple-store-" + graph_store,
+        "pulsar",
+        "vector-store-" + vector_store,
+        embeddings,
+        "graph-rag",
+        "grafana",
+        "trustgraph-base",
+        llm,
+        llm + "-rag",
+        "workbench-ui",
+        "prompt-template",
+        "agent-manager-react",
     ])
 
 def generate_config(