diff --git a/cmd/agent/cmd.go b/cmd/agent/cmd.go
index 23456ce..1d75369 100644
--- a/cmd/agent/cmd.go
+++ b/cmd/agent/cmd.go
@@ -66,7 +66,7 @@ func agentAddCmd() *cli.Command {
 			}
 			queueDir, _ := cmd.Flags().GetString("queue-dir")
 			if queueDir == "" {
-				queueDir = "/home/claude/ai-work/queue"
+				queueDir = "" // resolved by orchestrator config
 			}
 			model, _ := cmd.Flags().GetString("model")
 			dualRun, _ := cmd.Flags().GetBool("dual-run")
@@ -128,7 +128,7 @@ func agentAddCmd() *cli.Command {
 		},
 	}
 	cmd.Flags().String("forgejo-user", "", "Forgejo username (defaults to agent name)")
-	cmd.Flags().String("queue-dir", "", "Remote queue directory (default: /home/claude/ai-work/queue)")
+	cmd.Flags().String("queue-dir", "", "Remote queue directory (default: ~/.core/queue)")
 	cmd.Flags().String("model", "sonnet", "Primary AI model")
 	cmd.Flags().Bool("dual-run", false, "Enable Clotho dual-run verification")
 	return cmd
diff --git a/cmd/workspace/cmd_prep.go b/cmd/workspace/cmd_prep.go
index b7c7924..0a0c412 100644
--- a/cmd/workspace/cmd_prep.go
+++ b/cmd/workspace/cmd_prep.go
@@ -75,7 +75,7 @@ func runPrep(cmd *cli.Command, args []string) error {
 	if specsPath == "" {
 		home, err := os.UserHomeDir()
 		if err == nil {
-			specsPath = filepath.Join(home, "Code", "host-uk", "specs")
+			specsPath = filepath.Join(home, "Code", "specs")
 		}
 	}
 
diff --git a/pkg/orchestrator/config.go b/pkg/orchestrator/config.go
index b559d9d..6c4cb88 100644
--- a/pkg/orchestrator/config.go
+++ b/pkg/orchestrator/config.go
@@ -3,9 +3,11 @@ package orchestrator
 
 import (
 	"maps"
+	"path/filepath"
 
-	coreerr "forge.lthn.ai/core/go-log"
+	"forge.lthn.ai/core/agent/pkg/agentic"
 	"forge.lthn.ai/core/config"
+	coreerr "forge.lthn.ai/core/go-log"
 )
 
 // AgentConfig represents a single agent machine in the config file.
@@ -48,7 +50,7 @@ func LoadAgents(cfg *config.Config) (map[string]AgentConfig, error) {
 			return nil, coreerr.E("agentci.LoadAgents", "agent "+name+": host is required", nil)
 		}
 		if ac.QueueDir == "" {
-			ac.QueueDir = "/home/claude/ai-work/queue"
+			ac.QueueDir = filepath.Join(agentic.CoreRoot(), "queue")
 		}
 		if ac.Model == "" {
 			ac.Model = "sonnet"