diff --git a/api/libs/agents/src/agents/buster_multi_agent.rs b/api/libs/agents/src/agents/buster_multi_agent.rs
index 5ac483c1a..f4f04d974 100644
--- a/api/libs/agents/src/agents/buster_multi_agent.rs
+++ b/api/libs/agents/src/agents/buster_multi_agent.rs
@@ -150,7 +150,7 @@ impl BusterMultiAgent {
 
         // Create agent, passing the provider
         let agent = Arc::new(Agent::new(
-            "xai/grok-3-mini-fast-beta".to_string(), // Initial model (can be overridden by first mode)
+            "o4-mini".to_string(), // Initial model (can be overridden by first mode)
             user_id,
             session_id,
             "buster_multi_agent".to_string(),
diff --git a/api/libs/agents/src/agents/modes/analysis.rs b/api/libs/agents/src/agents/modes/analysis.rs
index 8923c3d57..7d58f9a15 100644
--- a/api/libs/agents/src/agents/modes/analysis.rs
+++ b/api/libs/agents/src/agents/modes/analysis.rs
@@ -30,7 +30,7 @@ pub fn get_configuration(agent_data: &ModeAgentData) -> ModeConfiguration {
     // Note: This prompt doesn't use {DATASETS}
 
     // 2. Define the model for this mode (Using default based on original MODEL = None)
-    let model = "xai/grok-3-mini-fast-beta".to_string();
+    let model = "o4-mini".to_string();
 
     // 3. Define the tool loader closure
     let tool_loader: Box<
diff --git a/api/libs/agents/src/agents/modes/data_catalog_search.rs b/api/libs/agents/src/agents/modes/data_catalog_search.rs
index 3768a8d29..5c881553a 100644
--- a/api/libs/agents/src/agents/modes/data_catalog_search.rs
+++ b/api/libs/agents/src/agents/modes/data_catalog_search.rs
@@ -32,7 +32,7 @@ pub fn get_configuration(agent_data: &ModeAgentData) -> ModeConfiguration {
         // Note: This prompt doesn't use {TODAYS_DATE}
 
     // 2. Define the model for this mode
-    let model = "xai/grok-3-mini-fast-beta".to_string(); // Use xai/grok-3-mini-fast-beta as requested
+    let model = "o4-mini".to_string(); // Use o4-mini as requested
 
     // 3. Define the tool loader closure
     let tool_loader: Box<dyn Fn(&Arc<Agent>) -> Pin<Box<dyn Future<Output = Result<()>> + Send>> + Send + Sync> = 
diff --git a/api/libs/agents/src/agents/modes/follow_up_initialization.rs b/api/libs/agents/src/agents/modes/follow_up_initialization.rs
index b6b42559d..bf09711ff 100644
--- a/api/libs/agents/src/agents/modes/follow_up_initialization.rs
+++ b/api/libs/agents/src/agents/modes/follow_up_initialization.rs
@@ -42,7 +42,7 @@ pub fn get_configuration(agent_data: &ModeAgentData) -> ModeConfiguration {
         .replace("{TODAYS_DATE}", &agent_data.todays_date);
 
     // 2. Define the model for this mode (Using a default, adjust if needed)
-    let model = "xai/grok-3-mini-fast-beta".to_string(); // Assuming default based on original MODEL = None
+    let model = "o4-mini".to_string(); // Assuming default based on original MODEL = None
 
     // 3. Define the tool loader closure
     let tool_loader: Box<dyn Fn(&Arc<Agent>) -> Pin<Box<dyn Future<Output = Result<()>> + Send>> + Send + Sync> = 
diff --git a/api/libs/agents/src/agents/modes/initialization.rs b/api/libs/agents/src/agents/modes/initialization.rs
index 546463062..8ae993499 100644
--- a/api/libs/agents/src/agents/modes/initialization.rs
+++ b/api/libs/agents/src/agents/modes/initialization.rs
@@ -26,8 +26,8 @@ pub fn get_configuration(agent_data: &ModeAgentData) -> ModeConfiguration {
 
     // 2. Define the model for this mode (Using a default, adjust if needed)
     //    Since the original MODEL was None, we might use the agent's default
-    //    or specify a standard one like "xai/grok-3-mini-fast-beta". Let's use "xai/grok-3-mini-fast-beta".
-    let model = "xai/grok-3-mini-fast-beta".to_string();
+    //    or specify a standard one like "o4-mini". Let's use "o4-mini".
+    let model = "o4-mini".to_string();
 
     // 3. Define the tool loader closure
     let tool_loader: Box<
diff --git a/api/libs/agents/src/agents/modes/mod.rs b/api/libs/agents/src/agents/modes/mod.rs
index 1306d2931..a4527b7cc 100644
--- a/api/libs/agents/src/agents/modes/mod.rs
+++ b/api/libs/agents/src/agents/modes/mod.rs
@@ -31,7 +31,7 @@ pub struct ModeAgentData {
 pub struct ModeConfiguration {
     /// The system prompt to use for the LLM call in this mode.
     pub prompt: String,
-    /// The specific LLM model identifier (e.g., "xai/grok-3-mini-fast-beta") to use for this mode.
+    /// The specific LLM model identifier (e.g., "o4-mini") to use for this mode.
     pub model: String,
     /// An async function/closure responsible for clearing existing tools
     /// and loading the specific tools required for this mode onto the agent.
diff --git a/api/libs/agents/src/agents/modes/planning.rs b/api/libs/agents/src/agents/modes/planning.rs
index baa65d4ef..0472b621f 100644
--- a/api/libs/agents/src/agents/modes/planning.rs
+++ b/api/libs/agents/src/agents/modes/planning.rs
@@ -28,7 +28,7 @@ pub fn get_configuration(agent_data: &ModeAgentData) -> ModeConfiguration {
         .replace("{DATASETS}", &agent_data.dataset_with_descriptions.join("\n\n"));
 
     // 2. Define the model for this mode (Using default based on original MODEL = None)
-    let model = "xai/grok-3-mini-fast-beta".to_string();
+    let model = "o4-mini".to_string();
 
     // 3. Define the tool loader closure
     let tool_loader: Box<
diff --git a/api/libs/agents/src/tools/categories/file_tools/filter_dashboards.rs b/api/libs/agents/src/tools/categories/file_tools/filter_dashboards.rs
index 21d1ad3db..12530854a 100644
--- a/api/libs/agents/src/tools/categories/file_tools/filter_dashboards.rs
+++ b/api/libs/agents/src/tools/categories/file_tools/filter_dashboards.rs
@@ -673,7 +673,7 @@ mod tests {
     fn test_tool_parameter_validation() {
         let tool = FilterDashboardsTool {
             agent: Arc::new(Agent::new(
-                "xai/grok-3-mini-fast-beta".to_string(),
+                "o4-mini".to_string(),
                 HashMap::new(),
                 Uuid::new_v4(),
                 Uuid::new_v4(),