diff --git a/03-evolution-case-study/iteration-1-bad/evals/agent.yaml b/03-evolution-case-study/iteration-1-bad/evals/agent.yaml
new file mode 100644
index 0000000..8c91869
--- /dev/null
+++ b/03-evolution-case-study/iteration-1-bad/evals/agent.yaml
@@ -0,0 +1,5 @@
+kind: Agent
+metadata:
+  name: "claude-code-acp"
+acp:
+  cmd: "claude-agent-acp"
diff --git a/03-evolution-case-study/iteration-1-bad/evals/eval.yaml b/03-evolution-case-study/iteration-1-bad/evals/eval.yaml
index ccea7b4..ad9167b 100644
--- a/03-evolution-case-study/iteration-1-bad/evals/eval.yaml
+++ b/03-evolution-case-study/iteration-1-bad/evals/eval.yaml
@@ -5,17 +5,17 @@ metadata:
 config:
   # Use Claude Code as the AI agent
   agent:
-    type: "builtin.claude-code"
+    type: file
+    path: agent.yaml
 
   # MCP server configuration
   mcpConfigFile: mcp-config.yaml
 
   # LLM judge configuration
   llmJudge:
-    env:
-      baseUrlKey: JUDGE_BASE_URL
-      apiKeyKey: JUDGE_API_KEY
-      modelNameKey: JUDGE_MODEL_NAME
+    ref:
+      type: file
+      path: agent.yaml
 
   # Test tasks
   taskSets:
diff --git a/03-evolution-case-study/iteration-2-good/evals/agent.yaml b/03-evolution-case-study/iteration-2-good/evals/agent.yaml
new file mode 100644
index 0000000..8c91869
--- /dev/null
+++ b/03-evolution-case-study/iteration-2-good/evals/agent.yaml
@@ -0,0 +1,5 @@
+kind: Agent
+metadata:
+  name: "claude-code-acp"
+acp:
+  cmd: "claude-agent-acp"
diff --git a/03-evolution-case-study/iteration-2-good/evals/eval.yaml b/03-evolution-case-study/iteration-2-good/evals/eval.yaml
index 1ccce07..3cfec45 100644
--- a/03-evolution-case-study/iteration-2-good/evals/eval.yaml
+++ b/03-evolution-case-study/iteration-2-good/evals/eval.yaml
@@ -5,17 +5,17 @@ metadata:
 config:
   # Use Claude Code as the AI agent
   agent:
-    type: "builtin.claude-code"
+    type: file
+    path: agent.yaml
 
   # MCP server configuration
   mcpConfigFile: mcp-config.yaml
 
   # LLM judge configuration
   llmJudge:
-    env:
-      baseUrlKey: JUDGE_BASE_URL
-      apiKeyKey: JUDGE_API_KEY
-      modelNameKey: JUDGE_MODEL_NAME
+    ref:
+      type: file
+      path: agent.yaml
 
   # Test tasks
   taskSets: