diff --git a/data/agents/author.json b/data/agents/author.json
index 1b5b4ac..7a8ba00 100644
--- a/data/agents/author.json
+++ b/data/agents/author.json
@@ -1,6 +1,8 @@
 {
   "prompt": [
-    "$XDG_CONFIG_HOME/ollie/prompts/agent-author.md",
+    "$XDG_CONFIG_HOME/ollie/prompts/agent-author.md"
+  ],
+  "userPrompts": [
     "$XDG_CONFIG_HOME/ollie/prompts/user-preferences.md"
   ],
   "autoLoad": [
diff --git a/data/agents/conductor.json b/data/agents/conductor.json
index be04686..a24524a 100644
--- a/data/agents/conductor.json
+++ b/data/agents/conductor.json
@@ -1,6 +1,8 @@
 {
   "prompt": [
-    "$XDG_CONFIG_HOME/ollie/prompts/agent-conductor.md",
+    "$XDG_CONFIG_HOME/ollie/prompts/agent-conductor.md"
+  ],
+  "userPrompts": [
     "$XDG_CONFIG_HOME/ollie/prompts/user-preferences.md"
   ],
   "autoLoad": [
diff --git a/data/agents/default.json b/data/agents/default.json
index 369fbbd..e86cb7e 100644
--- a/data/agents/default.json
+++ b/data/agents/default.json
@@ -1,8 +1,10 @@
 {
   "prompt": [
-    "$XDG_CONFIG_HOME/ollie/prompts/user-preferences.md",
     "$XDG_CONFIG_HOME/ollie/prompts/agent-coding.md"
   ],
+  "userPrompts": [
+    "$XDG_CONFIG_HOME/ollie/prompts/user-preferences.md"
+  ],
   "autoLoad": [
     "shell",
     "reasoning_think",
diff --git a/data/agents/foreman.json b/data/agents/foreman.json
index 4c673d4..ed3bf9e 100644
--- a/data/agents/foreman.json
+++ b/data/agents/foreman.json
@@ -1,6 +1,8 @@
 {
   "prompt": [
-    "$XDG_CONFIG_HOME/ollie/prompts/agent-foreman.md",
+    "$XDG_CONFIG_HOME/ollie/prompts/agent-foreman.md"
+  ],
+  "userPrompts": [
     "$XDG_CONFIG_HOME/ollie/prompts/user-preferences.md"
   ],
   "autoLoad": [
diff --git a/data/agents/panelist.json b/data/agents/panelist.json
index 3420ad2..bf231ac 100644
--- a/data/agents/panelist.json
+++ b/data/agents/panelist.json
@@ -1,6 +1,8 @@
 {
   "prompt": [
-    "$XDG_CONFIG_HOME/ollie/prompts/agent-panelist.md",
+    "$XDG_CONFIG_HOME/ollie/prompts/agent-panelist.md"
+  ],
+  "userPrompts": [
     "$XDG_CONFIG_HOME/ollie/prompts/user-preferences.md"
   ],
   "autoLoad": [
diff --git a/data/agents/reviewer.json b/data/agents/reviewer.json
index c12a75c..18754c8 100644
--- a/data/agents/reviewer.json
+++ b/data/agents/reviewer.json
@@ -1,6 +1,8 @@
 {
   "prompt": [
-    "$XDG_CONFIG_HOME/ollie/prompts/agent-reviewer.md",
+    "$XDG_CONFIG_HOME/ollie/prompts/agent-reviewer.md"
+  ],
+  "userPrompts": [
     "$XDG_CONFIG_HOME/ollie/prompts/user-preferences.md"
   ],
   "autoLoad": [