diff --git a/chart/templates/ui/deployment.yaml b/chart/templates/ui/deployment.yaml
index 8d8363f..44bd086 100644
--- a/chart/templates/ui/deployment.yaml
+++ b/chart/templates/ui/deployment.yaml
@@ -39,8 +39,8 @@ spec:
               value: "###ZARF_VAR_SYSTEM_PROMPT###"
             - name: FINAL_SUMMARIZATION_PROMPT
               value: "###ZARF_VAR_FINAL_SUMMARIZATION_PROMPT###"
-            - name: INTERMEDIATE_SUMMARY_PROMPT
-              value: "###ZARF_VAR_INTERMEDIATE_SUMMARY_PROMPT###"
+            - name: INTERMEDIATE_SUMMARIZATION_PROMPT
+              value: "###ZARF_VAR_INTERMEDIATE_SUMMARIZATION_PROMPT###"
             - name: PUBLIC_DEFAULT_TEMPERATURE
               value: "###ZARF_VAR_TEMPERATURE###"
             - name: MAX_TOKENS
diff --git a/chart/templates/ui/service.yaml b/chart/templates/ui/service.yaml
index 71cd5ea..49e8833 100644
--- a/chart/templates/ui/service.yaml
+++ b/chart/templates/ui/service.yaml
@@ -19,4 +19,4 @@ spec:
     - name: http
       port: 3000
       targetPort: 3000
-      protocol: TCP
\ No newline at end of file
+      protocol: TCP
diff --git a/src/lib/components/chatPanel.svelte b/src/lib/components/chatPanel.svelte
index 488a638..f3d2c74 100644
--- a/src/lib/components/chatPanel.svelte
+++ b/src/lib/components/chatPanel.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { ArrowRightSolid, RotateOutline } from "flowbite-svelte-icons";
+    import { ArrowRightSolid } from "flowbite-svelte-icons";
     import SvelteMarkdown from "svelte-markdown";
     import codeblock from "$lib/components/codeblock.svelte";
     import codespan from "$lib/components/codespan.svelte";
@@ -92,7 +92,7 @@
         if (ragEndpointActive && agentSettings.rag_enabled) {
             // Construct the RAG message that will be inserted before the user's message
             let ragResponse = {
-                role: "system",
+                role: "user",
                 content: await queryRag(lastMessage.content),
             };
 
diff --git a/src/lib/prompt.ts b/src/lib/prompt.ts
deleted file mode 100644
index e6a484d..0000000
--- a/src/lib/prompt.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { env } from "$env/dynamic/private";
-
-export const generateSummarizationPrompt = (
-  model: string,
-  transcription: string,
-  finalSummary?: boolean
-) => {
-  const systemPrompt = finalSummary
-    ? env.FINAL_SUMMARIZATION_PROMPT
-    : env.INTERMEDIATE_SUMMARY_PROMPT;
-
-  if (model === "mpt-7b-chat") {
-    return `<|im_start|>system ${systemPrompt}<|im_end|>
-    <|im_start|>user ${transcription}<|im_end|>
-    <|im_start|>assistant `;
-  }
-  return `SYSTEM: ${systemPrompt}\n
-        USER: ${transcription}\n
-        ASSISTANT: `;
-};
diff --git a/src/routes/upload/+page.server.ts b/src/routes/upload/+page.server.ts
index c90eb42..83e07a1 100644
--- a/src/routes/upload/+page.server.ts
+++ b/src/routes/upload/+page.server.ts
@@ -10,7 +10,6 @@ import OpenAI from "openai";
 import { env } from "$env/dynamic/private";
 import { PUBLIC_TRANSCRIPTION_MODEL } from "$env/static/public";
 import { batchTranscript, tokenize } from "$lib/tokenizer";
-import { generateSummarizationPrompt } from "$lib/prompt";
 import { clearTmp } from "$lib/cleanup";
 
 const TEMPORARY_DIRECTORY = tmpdir();
diff --git a/zarf.yaml b/zarf.yaml
index fefe7fa..a552698 100644
--- a/zarf.yaml
+++ b/zarf.yaml
@@ -44,7 +44,7 @@ variables:
     sensitive: false
   - name: MODEL
     description: The default LLM model to use for chat and summarization
-    default: llama-cpp-python
+    default: vllm
     prompt: true
     sensitive: false
   - name: TRANSCRIPTION_MODEL
@@ -54,7 +54,7 @@ variables:
     sensitive: false
   - name: SYSTEM_PROMPT
     description: The default system prompt to use for the LLM
-    default: "You are a helpful AI assistant created by Defense Unicorns."
+    default: "You are a helpful AI assistant."
     prompt: true
     sensitive: false
   - name: FINAL_SUMMARIZATION_PROMPT
@@ -62,7 +62,7 @@ variables:
     default: "You are a summarizer tasked with creating summaries. You will return an coherent and concise summary using 3 concise sections that are each separated by a newline character: 1) BOTTOM LINE UP FRONT: this section will be a concise paragraph containing an overarching, executive summary of all the notes. 2) NOTES: this section will be bullet points highlighting and summarizing key points, risks, issues, and opportunities. 3) ACTION ITEMS: this section will focus on listing any action items, unanswered questions, or issues present in the text; if there are none that can be identified from the notes, just return 'None' for ACTION ITEMS; if possible, also include the individual or team assigned to each item in ACTION ITEMS."
     prompt: true
     sensitive: false
-  - name: INTERMEDIATE_SUMMARY_PROMPT
+  - name: INTERMEDIATE_SUMMARIZATION_PROMPT
     description: The default system summarization prompt to use for the LLM when summary batching activates
     default: "You are a summarizer tasked with creating summaries. Your key activities include identifying the main points and key details in the given text, and condensing the information into a concise summary that accurately reflects the original text. It is important to avoid any risks such as misinterpreting the text, omitting crucial information, or distorting the original meaning. Use clear and specific language, ensuring that the summary is coherent, well-organized, and effectively communicates the main ideas of the original text."
     prompt: true