diff --git a/packages/workflow-role-coder/package.json b/packages/workflow-role-coder/package.json
deleted file mode 100644
index eaaa949..0000000
--- a/packages/workflow-role-coder/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "@uncaged/workflow-role-coder",
-  "version": "0.1.0",
-  "type": "module",
-  "main": "src/index.ts",
-  "types": "src/index.ts",
-  "scripts": {
-    "build": "echo 'TODO'",
-    "test": "echo no tests"
-  },
-  "dependencies": {
-    "@uncaged/workflow": "workspace:*",
-    "zod": "^4.0.0"
-  }
-}
diff --git a/packages/workflow-role-coder/src/index.ts b/packages/workflow-role-coder/src/index.ts
deleted file mode 100644
index 03beed8..0000000
--- a/packages/workflow-role-coder/src/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { type CoderMeta, coderMetaSchema, coderRole } from "./coder.js";
diff --git a/packages/workflow-role-coder/tsconfig.json b/packages/workflow-role-coder/tsconfig.json
deleted file mode 100644
index 2816fef..0000000
--- a/packages/workflow-role-coder/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "dist",
-    "composite": true
-  },
-  "include": ["src/**/*.ts"],
-  "references": [{ "path": "../workflow" }]
-}
diff --git a/packages/workflow-role-committer/package.json b/packages/workflow-role-committer/package.json
deleted file mode 100644
index 27cfd4d..0000000
--- a/packages/workflow-role-committer/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "@uncaged/workflow-role-committer",
-  "version": "0.1.0",
-  "type": "module",
-  "main": "src/index.ts",
-  "types": "src/index.ts",
-  "scripts": {
-    "build": "echo 'TODO'",
-    "test": "bun test"
-  },
-  "dependencies": {
-    "@uncaged/workflow": "workspace:*",
-    "zod": "^4.0.0"
-  }
-}
diff --git a/packages/workflow-role-committer/src/index.ts b/packages/workflow-role-committer/src/index.ts
deleted file mode 100644
index 199622c..0000000
--- a/packages/workflow-role-committer/src/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { type CommitterMeta, committerMetaSchema, committerRole } from "./committer.js";
diff --git a/packages/workflow-role-committer/tsconfig.json b/packages/workflow-role-committer/tsconfig.json
deleted file mode 100644
index 2816fef..0000000
--- a/packages/workflow-role-committer/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "dist",
-    "composite": true
-  },
-  "include": ["src/**/*.ts"],
-  "references": [{ "path": "../workflow" }]
-}
diff --git a/packages/workflow-role-planner/package.json b/packages/workflow-role-planner/package.json
deleted file mode 100644
index b94dacf..0000000
--- a/packages/workflow-role-planner/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "@uncaged/workflow-role-planner",
-  "version": "0.1.0",
-  "type": "module",
-  "main": "src/index.ts",
-  "types": "src/index.ts",
-  "scripts": {
-    "build": "echo 'TODO'",
-    "test": "echo no tests"
-  },
-  "dependencies": {
-    "@uncaged/workflow": "workspace:*",
-    "zod": "^4.0.0"
-  }
-}
diff --git a/packages/workflow-role-planner/src/index.ts b/packages/workflow-role-planner/src/index.ts
deleted file mode 100644
index 50334a1..0000000
--- a/packages/workflow-role-planner/src/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export {
-  type PlannerMeta,
-  phaseSchema,
-  plannerMetaSchema,
-  plannerRole,
-} from "./planner.js";
diff --git a/packages/workflow-role-planner/tsconfig.json b/packages/workflow-role-planner/tsconfig.json
deleted file mode 100644
index 2816fef..0000000
--- a/packages/workflow-role-planner/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "dist",
-    "composite": true
-  },
-  "include": ["src/**/*.ts"],
-  "references": [{ "path": "../workflow" }]
-}
diff --git a/packages/workflow-role-preparer/package.json b/packages/workflow-role-preparer/package.json
deleted file mode 100644
index 61c36f7..0000000
--- a/packages/workflow-role-preparer/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "@uncaged/workflow-role-preparer",
-  "version": "0.1.0",
-  "type": "module",
-  "main": "src/index.ts",
-  "types": "src/index.ts",
-  "scripts": {
-    "build": "echo 'TODO'",
-    "test": "echo no tests"
-  },
-  "dependencies": {
-    "@uncaged/workflow": "workspace:*",
-    "zod": "^4.0.0"
-  }
-}
diff --git a/packages/workflow-role-preparer/tsconfig.json b/packages/workflow-role-preparer/tsconfig.json
deleted file mode 100644
index 75eba9f..0000000
--- a/packages/workflow-role-preparer/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "dist"
-  },
-  "include": ["src"]
-}
diff --git a/packages/workflow-role-reviewer/package.json b/packages/workflow-role-reviewer/package.json
deleted file mode 100644
index ace13d3..0000000
--- a/packages/workflow-role-reviewer/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "@uncaged/workflow-role-reviewer",
-  "version": "0.1.0",
-  "type": "module",
-  "main": "src/index.ts",
-  "types": "src/index.ts",
-  "scripts": {
-    "build": "echo 'TODO'",
-    "test": "bun test"
-  },
-  "dependencies": {
-    "@uncaged/workflow": "workspace:*",
-    "zod": "^4.0.0"
-  }
-}
diff --git a/packages/workflow-role-reviewer/src/index.ts b/packages/workflow-role-reviewer/src/index.ts
deleted file mode 100644
index 0677b49..0000000
--- a/packages/workflow-role-reviewer/src/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { type ReviewerMeta, reviewerMetaSchema, reviewerRole } from "./reviewer.js";
diff --git a/packages/workflow-role-reviewer/tsconfig.json b/packages/workflow-role-reviewer/tsconfig.json
deleted file mode 100644
index 2816fef..0000000
--- a/packages/workflow-role-reviewer/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "dist",
-    "composite": true
-  },
-  "include": ["src/**/*.ts"],
-  "references": [{ "path": "../workflow" }]
-}
diff --git a/packages/workflow-role-submitter/package.json b/packages/workflow-role-submitter/package.json
deleted file mode 100644
index 71643d4..0000000
--- a/packages/workflow-role-submitter/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "@uncaged/workflow-role-submitter",
-  "version": "0.1.0",
-  "type": "module",
-  "main": "src/index.ts",
-  "types": "src/index.ts",
-  "scripts": {
-    "build": "echo 'TODO'",
-    "test": "bun test"
-  },
-  "dependencies": {
-    "@uncaged/workflow": "workspace:*",
-    "zod": "^4.0.0"
-  }
-}
diff --git a/packages/workflow-role-submitter/src/index.ts b/packages/workflow-role-submitter/src/index.ts
deleted file mode 100644
index 83a7428..0000000
--- a/packages/workflow-role-submitter/src/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { type SubmitterMeta, submitterMetaSchema, submitterRole } from "./submitter.js";
diff --git a/packages/workflow-role-submitter/tsconfig.json b/packages/workflow-role-submitter/tsconfig.json
deleted file mode 100644
index 2816fef..0000000
--- a/packages/workflow-role-submitter/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "dist",
-    "composite": true
-  },
-  "include": ["src/**/*.ts"],
-  "references": [{ "path": "../workflow" }]
-}
diff --git a/packages/workflow-role-tester/package.json b/packages/workflow-role-tester/package.json
deleted file mode 100644
index 5180905..0000000
--- a/packages/workflow-role-tester/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "@uncaged/workflow-role-tester",
-  "version": "0.1.0",
-  "type": "module",
-  "main": "src/index.ts",
-  "types": "src/index.ts",
-  "scripts": {
-    "build": "echo 'TODO'",
-    "test": "bun test"
-  },
-  "dependencies": {
-    "@uncaged/workflow": "workspace:*",
-    "zod": "^4.0.0"
-  }
-}
diff --git a/packages/workflow-role-tester/src/index.ts b/packages/workflow-role-tester/src/index.ts
deleted file mode 100644
index 3e656b3..0000000
--- a/packages/workflow-role-tester/src/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { type TesterMeta, testerMetaSchema, testerRole } from "./tester.js";
diff --git a/packages/workflow-role-tester/tsconfig.json b/packages/workflow-role-tester/tsconfig.json
deleted file mode 100644
index 2816fef..0000000
--- a/packages/workflow-role-tester/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "dist",
-    "composite": true
-  },
-  "include": ["src/**/*.ts"],
-  "references": [{ "path": "../workflow" }]
-}
diff --git a/packages/workflow-role-committer/__tests__/committer.test.ts b/packages/workflow-template-develop/__tests__/committer.test.ts
similarity index 87%
rename from packages/workflow-role-committer/__tests__/committer.test.ts
rename to packages/workflow-template-develop/__tests__/committer.test.ts
index dedfe79..5633a33 100644
--- a/packages/workflow-role-committer/__tests__/committer.test.ts
+++ b/packages/workflow-template-develop/__tests__/committer.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
 
-import { committerMetaSchema, committerRole } from "../src/committer.js";
+import { committerMetaSchema, committerRole } from "../src/roles/committer.js";
 
 describe("committerRole", () => {
   test("committed sample validates against schema", () => {
diff --git a/packages/workflow-template-develop/__tests__/develop-template.test.ts b/packages/workflow-template-develop/__tests__/develop-template.test.ts
index 4b40329..6003626 100644
--- a/packages/workflow-template-develop/__tests__/develop-template.test.ts
+++ b/packages/workflow-template-develop/__tests__/develop-template.test.ts
@@ -6,12 +6,9 @@ import {
   START,
   validateWorkflowDescriptor,
 } from "@uncaged/workflow";
-
-import type { CommitterMeta } from "@uncaged/workflow-role-committer";
-import type { PlannerMeta } from "@uncaged/workflow-role-planner";
-
 import { buildDevelopDescriptor } from "../src/descriptor.js";
 import { developModerator } from "../src/index.js";
+import type { CommitterMeta, PlannerMeta } from "../src/roles/index.js";
 import type { DevelopMeta } from "../src/roles.js";
 
 const DEFAULT_PHASES: PlannerMeta["phases"] = [
diff --git a/packages/workflow-role-reviewer/__tests__/reviewer.test.ts b/packages/workflow-template-develop/__tests__/reviewer.test.ts
similarity index 85%
rename from packages/workflow-role-reviewer/__tests__/reviewer.test.ts
rename to packages/workflow-template-develop/__tests__/reviewer.test.ts
index 96551ec..57cebc7 100644
--- a/packages/workflow-role-reviewer/__tests__/reviewer.test.ts
+++ b/packages/workflow-template-develop/__tests__/reviewer.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
 
-import { reviewerMetaSchema, reviewerRole } from "../src/reviewer.js";
+import { reviewerMetaSchema, reviewerRole } from "../src/roles/reviewer.js";
 
 describe("reviewerRole", () => {
   test("approved sample validates against schema", () => {
diff --git a/packages/workflow-template-develop/package.json b/packages/workflow-template-develop/package.json
index 2447146..3f47c93 100644
--- a/packages/workflow-template-develop/package.json
+++ b/packages/workflow-template-develop/package.json
@@ -10,10 +10,6 @@
   },
   "dependencies": {
     "@uncaged/workflow": "workspace:*",
-    "@uncaged/workflow-role-coder": "workspace:*",
-    "@uncaged/workflow-role-committer": "workspace:*",
-    "@uncaged/workflow-role-planner": "workspace:*",
-    "@uncaged/workflow-role-reviewer": "workspace:*",
-    "@uncaged/workflow-role-tester": "workspace:*"
+    "zod": "^4.0.0"
   }
 }
diff --git a/packages/workflow-template-develop/src/index.ts b/packages/workflow-template-develop/src/index.ts
index f005c5e..1bb54f2 100644
--- a/packages/workflow-template-develop/src/index.ts
+++ b/packages/workflow-template-develop/src/index.ts
@@ -10,34 +10,26 @@ import {
 import { developModerator } from "./moderator.js";
 import { DEVELOP_WORKFLOW_DESCRIPTION, type DevelopMeta, developRoles } from "./roles.js";
 
+export { buildDevelopDescriptor } from "./descriptor.js";
+export { developModerator } from "./moderator.js";
 export {
   type CoderMeta,
+  type CommitterMeta,
   coderMetaSchema,
   coderRole,
-} from "@uncaged/workflow-role-coder";
-export {
-  type CommitterMeta,
   committerMetaSchema,
   committerRole,
-} from "@uncaged/workflow-role-committer";
-export {
   type PlannerMeta,
   phaseSchema,
   plannerMetaSchema,
   plannerRole,
-} from "@uncaged/workflow-role-planner";
-export {
   type ReviewerMeta,
   reviewerMetaSchema,
   reviewerRole,
-} from "@uncaged/workflow-role-reviewer";
-export {
   type TesterMeta,
   testerMetaSchema,
   testerRole,
-} from "@uncaged/workflow-role-tester";
-export { buildDevelopDescriptor } from "./descriptor.js";
-export { developModerator } from "./moderator.js";
+} from "./roles/index.js";
 export {
   DEVELOP_WORKFLOW_DESCRIPTION,
   type DevelopMeta,
diff --git a/packages/workflow-template-develop/src/roles.ts b/packages/workflow-template-develop/src/roles.ts
index 197f363..c7a44a5 100644
--- a/packages/workflow-template-develop/src/roles.ts
+++ b/packages/workflow-template-develop/src/roles.ts
@@ -1,9 +1,9 @@
 import type { RoleDefinition } from "@uncaged/workflow";
-import { type CoderMeta, coderRole } from "@uncaged/workflow-role-coder";
-import { type CommitterMeta, committerRole } from "@uncaged/workflow-role-committer";
-import { type PlannerMeta, plannerRole } from "@uncaged/workflow-role-planner";
-import { type ReviewerMeta, reviewerRole } from "@uncaged/workflow-role-reviewer";
-import { type TesterMeta, testerRole } from "@uncaged/workflow-role-tester";
+import { type CoderMeta, coderRole } from "./roles/coder.js";
+import { type CommitterMeta, committerRole } from "./roles/committer.js";
+import { type PlannerMeta, plannerRole } from "./roles/planner.js";
+import { type ReviewerMeta, reviewerRole } from "./roles/reviewer.js";
+import { type TesterMeta, testerRole } from "./roles/tester.js";
 
 export const DEVELOP_WORKFLOW_DESCRIPTION =
   "Plan phases, implement incrementally, review, verify with tests/build/lint, and commit (planner → coder [repeat per phase] → reviewer → tester → committer).";
diff --git a/packages/workflow-role-coder/src/coder.ts b/packages/workflow-template-develop/src/roles/coder.ts
similarity index 100%
rename from packages/workflow-role-coder/src/coder.ts
rename to packages/workflow-template-develop/src/roles/coder.ts
diff --git a/packages/workflow-role-committer/src/committer.ts b/packages/workflow-template-develop/src/roles/committer.ts
similarity index 100%
rename from packages/workflow-role-committer/src/committer.ts
rename to packages/workflow-template-develop/src/roles/committer.ts
diff --git a/packages/workflow-template-develop/src/roles/index.ts b/packages/workflow-template-develop/src/roles/index.ts
new file mode 100644
index 0000000..0eef1db
--- /dev/null
+++ b/packages/workflow-template-develop/src/roles/index.ts
@@ -0,0 +1,10 @@
+export { type CoderMeta, coderMetaSchema, coderRole } from "./coder.js";
+export { type CommitterMeta, committerMetaSchema, committerRole } from "./committer.js";
+export {
+  type PlannerMeta,
+  phaseSchema,
+  plannerMetaSchema,
+  plannerRole,
+} from "./planner.js";
+export { type ReviewerMeta, reviewerMetaSchema, reviewerRole } from "./reviewer.js";
+export { type TesterMeta, testerMetaSchema, testerRole } from "./tester.js";
diff --git a/packages/workflow-role-planner/src/planner.ts b/packages/workflow-template-develop/src/roles/planner.ts
similarity index 100%
rename from packages/workflow-role-planner/src/planner.ts
rename to packages/workflow-template-develop/src/roles/planner.ts
diff --git a/packages/workflow-role-reviewer/src/reviewer.ts b/packages/workflow-template-develop/src/roles/reviewer.ts
similarity index 100%
rename from packages/workflow-role-reviewer/src/reviewer.ts
rename to packages/workflow-template-develop/src/roles/reviewer.ts
diff --git a/packages/workflow-role-tester/src/tester.ts b/packages/workflow-template-develop/src/roles/tester.ts
similarity index 100%
rename from packages/workflow-role-tester/src/tester.ts
rename to packages/workflow-template-develop/src/roles/tester.ts
diff --git a/packages/workflow-template-develop/tsconfig.json b/packages/workflow-template-develop/tsconfig.json
index bc7bafc..2816fef 100644
--- a/packages/workflow-template-develop/tsconfig.json
+++ b/packages/workflow-template-develop/tsconfig.json
@@ -6,12 +6,5 @@
     "composite": true
   },
   "include": ["src/**/*.ts"],
-  "references": [
-    { "path": "../workflow" },
-    { "path": "../workflow-role-coder" },
-    { "path": "../workflow-role-committer" },
-    { "path": "../workflow-role-planner" },
-    { "path": "../workflow-role-reviewer" },
-    { "path": "../workflow-role-tester" }
-  ]
+  "references": [{ "path": "../workflow" }]
 }
diff --git a/packages/workflow-template-solve-issue/__tests__/solve-issue-template.test.ts b/packages/workflow-template-solve-issue/__tests__/solve-issue-template.test.ts
index 75affd7..ce01557 100644
--- a/packages/workflow-template-solve-issue/__tests__/solve-issue-template.test.ts
+++ b/packages/workflow-template-solve-issue/__tests__/solve-issue-template.test.ts
@@ -11,13 +11,10 @@ import {
   START,
   validateWorkflowDescriptor,
 } from "@uncaged/workflow";
-
-import type { PreparerMeta } from "@uncaged/workflow-role-preparer";
-import type { SubmitterMeta } from "@uncaged/workflow-role-submitter";
-
 import { buildSolveIssueDescriptor } from "../src/descriptor.js";
 import type { DeveloperMeta } from "../src/developer.js";
 import { createSolveIssueRun, solveIssueModerator } from "../src/index.js";
+import type { PreparerMeta, SubmitterMeta } from "../src/roles/index.js";
 import type { SolveIssueMeta } from "../src/roles.js";
 
 function jsonResponse(payload: Record<string, unknown>): Response {
diff --git a/packages/workflow-role-submitter/__tests__/submitter.test.ts b/packages/workflow-template-solve-issue/__tests__/submitter.test.ts
similarity index 93%
rename from packages/workflow-role-submitter/__tests__/submitter.test.ts
rename to packages/workflow-template-solve-issue/__tests__/submitter.test.ts
index 7975e92..9f68d57 100644
--- a/packages/workflow-role-submitter/__tests__/submitter.test.ts
+++ b/packages/workflow-template-solve-issue/__tests__/submitter.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
 
-import { submitterMetaSchema, submitterRole } from "../src/submitter.js";
+import { submitterMetaSchema, submitterRole } from "../src/roles/submitter.js";
 
 describe("submitterRole", () => {
   test("submitted sample validates against schema", () => {
diff --git a/packages/workflow-template-solve-issue/package.json b/packages/workflow-template-solve-issue/package.json
index 246c75c..6f46499 100644
--- a/packages/workflow-template-solve-issue/package.json
+++ b/packages/workflow-template-solve-issue/package.json
@@ -10,8 +10,6 @@
   },
   "dependencies": {
     "@uncaged/workflow": "workspace:*",
-    "@uncaged/workflow-role-preparer": "workspace:*",
-    "@uncaged/workflow-role-submitter": "workspace:*",
     "zod": "^4.0.0"
   }
 }
diff --git a/packages/workflow-template-solve-issue/src/index.ts b/packages/workflow-template-solve-issue/src/index.ts
index a59dd60..42c4d47 100644
--- a/packages/workflow-template-solve-issue/src/index.ts
+++ b/packages/workflow-template-solve-issue/src/index.ts
@@ -11,16 +11,6 @@ import {
 import { solveIssueModerator } from "./moderator.js";
 import { SOLVE_ISSUE_WORKFLOW_DESCRIPTION, type SolveIssueMeta, solveIssueRoles } from "./roles.js";
 
-export {
-  type PreparerMeta,
-  preparerMetaSchema,
-  preparerRole,
-} from "@uncaged/workflow-role-preparer";
-export {
-  type SubmitterMeta,
-  submitterMetaSchema,
-  submitterRole,
-} from "@uncaged/workflow-role-submitter";
 export { buildSolveIssueDescriptor } from "./descriptor.js";
 export {
   type DeveloperMeta,
@@ -28,6 +18,14 @@ export {
   developerRole,
 } from "./developer.js";
 export { solveIssueModerator } from "./moderator.js";
+export {
+  type PreparerMeta,
+  preparerMetaSchema,
+  preparerRole,
+  type SubmitterMeta,
+  submitterMetaSchema,
+  submitterRole,
+} from "./roles/index.js";
 export {
   SOLVE_ISSUE_WORKFLOW_DESCRIPTION,
   type SolveIssueMeta,
diff --git a/packages/workflow-template-solve-issue/src/roles.ts b/packages/workflow-template-solve-issue/src/roles.ts
index f177bdc..5ae6f7d 100644
--- a/packages/workflow-template-solve-issue/src/roles.ts
+++ b/packages/workflow-template-solve-issue/src/roles.ts
@@ -1,8 +1,7 @@
 import type { RoleDefinition } from "@uncaged/workflow";
-import { type PreparerMeta, preparerRole } from "@uncaged/workflow-role-preparer";
-import { type SubmitterMeta, submitterRole } from "@uncaged/workflow-role-submitter";
-
 import { type DeveloperMeta, developerRole } from "./developer.js";
+import { type PreparerMeta, preparerRole } from "./roles/preparer.js";
+import { type SubmitterMeta, submitterRole } from "./roles/submitter.js";
 
 export const SOLVE_ISSUE_WORKFLOW_DESCRIPTION =
   "Resolve an issue end-to-end by preparing the repo, delegating implementation to the develop workflow, and opening a pull request (preparer → developer → submitter).";
diff --git a/packages/workflow-role-preparer/src/index.ts b/packages/workflow-template-solve-issue/src/roles/index.ts
similarity index 50%
rename from packages/workflow-role-preparer/src/index.ts
rename to packages/workflow-template-solve-issue/src/roles/index.ts
index 44f706a..bbd6a02 100644
--- a/packages/workflow-role-preparer/src/index.ts
+++ b/packages/workflow-template-solve-issue/src/roles/index.ts
@@ -3,3 +3,4 @@ export {
   preparerMetaSchema,
   preparerRole,
 } from "./preparer.js";
+export { type SubmitterMeta, submitterMetaSchema, submitterRole } from "./submitter.js";
diff --git a/packages/workflow-role-preparer/src/preparer.ts b/packages/workflow-template-solve-issue/src/roles/preparer.ts
similarity index 100%
rename from packages/workflow-role-preparer/src/preparer.ts
rename to packages/workflow-template-solve-issue/src/roles/preparer.ts
diff --git a/packages/workflow-role-submitter/src/submitter.ts b/packages/workflow-template-solve-issue/src/roles/submitter.ts
similarity index 100%
rename from packages/workflow-role-submitter/src/submitter.ts
rename to packages/workflow-template-solve-issue/src/roles/submitter.ts
diff --git a/packages/workflow-template-solve-issue/tsconfig.json b/packages/workflow-template-solve-issue/tsconfig.json
index 70efff6..2816fef 100644
--- a/packages/workflow-template-solve-issue/tsconfig.json
+++ b/packages/workflow-template-solve-issue/tsconfig.json
@@ -6,9 +6,5 @@
     "composite": true
   },
   "include": ["src/**/*.ts"],
-  "references": [
-    { "path": "../workflow" },
-    { "path": "../workflow-role-preparer" },
-    { "path": "../workflow-role-submitter" }
-  ]
+  "references": [{ "path": "../workflow" }]
 }
diff --git a/tsconfig.json b/tsconfig.json
index 4acabb4..8de7ef5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -19,13 +19,6 @@
   "references": [
     { "path": "packages/workflow" },
     { "path": "packages/workflow-agent-llm" },
-    { "path": "packages/workflow-role-committer" },
-    { "path": "packages/workflow-role-coder" },
-    { "path": "packages/workflow-role-planner" },
-    { "path": "packages/workflow-role-preparer" },
-    { "path": "packages/workflow-role-reviewer" },
-    { "path": "packages/workflow-role-submitter" },
-    { "path": "packages/workflow-role-tester" },
     { "path": "packages/workflow-agent-cursor" },
     { "path": "packages/workflow-agent-hermes" },
     { "path": "packages/workflow-util-agent" },