diff --git a/product_demos/Data-Science/ai-agent/_resources/01-setup.py b/product_demos/Data-Science/ai-agent/_resources/01-setup.py
index 5e45e27d..b6bef690 100644
--- a/product_demos/Data-Science/ai-agent/_resources/01-setup.py
+++ b/product_demos/Data-Science/ai-agent/_resources/01-setup.py
@@ -18,8 +18,8 @@
 
 # COMMAND ----------
 
-for f in dbutils.fs.ls(volume_folder):
-  dbutils.fs.rm(f.path, True)  
+# for f in dbutils.fs.ls(volume_folder):
+#   dbutils.fs.rm(f.path, True)  
 #dbutils.fs.rm(volume_folder, True)
 
 # COMMAND ----------
diff --git a/product_demos/Data-Science/ai-agent/_resources/04-eval-dataset-generation.py b/product_demos/Data-Science/ai-agent/_resources/04-eval-dataset-generation.py
index 5d826b6f..19722260 100644
--- a/product_demos/Data-Science/ai-agent/_resources/04-eval-dataset-generation.py
+++ b/product_demos/Data-Science/ai-agent/_resources/04-eval-dataset-generation.py
@@ -86,7 +86,7 @@ def generate_question(email: pd.Series, row_id: pd.Series) -> pd.Series:
 final_df_raw = spark.sql("""
 SELECT 
   question,
-  AI_QUERY("databricks-claude-3-7-sonnet", prompt) AS expected_facts_json
+  AI_QUERY("databricks-llama-4-maverick", prompt) AS expected_facts_json
 FROM customer_test_questions
 """)
 
@@ -107,4 +107,5 @@ def generate_question(email: pd.Series, row_id: pd.Series) -> pd.Series:
 
 # COMMAND ----------
 
-display(eval_df)
+# The display command can be skipped, since it isn't shown on the calling noterbook and just costs time...
+# display(eval_df)
diff --git a/product_demos/Data-Science/ai-agent/config.py b/product_demos/Data-Science/ai-agent/config.py
index b0922c39..dc24c228 100644
--- a/product_demos/Data-Science/ai-agent/config.py
+++ b/product_demos/Data-Science/ai-agent/config.py
@@ -22,4 +22,4 @@
 ENDPOINT_NAME = f'{MODEL_NAME}_{catalog}_{db}'[:60]
 
 # This must be a tool-enabled model
-LLM_ENDPOINT_NAME = 'databricks-claude-3-7-sonnet'
+LLM_ENDPOINT_NAME = 'databricks-llama-4-maverick'