diff --git a/.trellis/tasks/05-26-hyb-oa-delivery-trellis-only/check.jsonl b/.trellis/tasks/archive/2026-05/05-26-hyb-oa-delivery-trellis-only/check.jsonl
similarity index 100%
rename from .trellis/tasks/05-26-hyb-oa-delivery-trellis-only/check.jsonl
rename to .trellis/tasks/archive/2026-05/05-26-hyb-oa-delivery-trellis-only/check.jsonl
diff --git a/.trellis/tasks/05-26-hyb-oa-delivery-trellis-only/implement.jsonl b/.trellis/tasks/archive/2026-05/05-26-hyb-oa-delivery-trellis-only/implement.jsonl
similarity index 100%
rename from .trellis/tasks/05-26-hyb-oa-delivery-trellis-only/implement.jsonl
rename to .trellis/tasks/archive/2026-05/05-26-hyb-oa-delivery-trellis-only/implement.jsonl
diff --git a/.trellis/tasks/05-26-hyb-oa-delivery-trellis-only/implement.md b/.trellis/tasks/archive/2026-05/05-26-hyb-oa-delivery-trellis-only/implement.md
similarity index 100%
rename from .trellis/tasks/05-26-hyb-oa-delivery-trellis-only/implement.md
rename to .trellis/tasks/archive/2026-05/05-26-hyb-oa-delivery-trellis-only/implement.md
diff --git a/.trellis/tasks/05-26-hyb-oa-delivery-trellis-only/prd.md b/.trellis/tasks/archive/2026-05/05-26-hyb-oa-delivery-trellis-only/prd.md
similarity index 100%
rename from .trellis/tasks/05-26-hyb-oa-delivery-trellis-only/prd.md
rename to .trellis/tasks/archive/2026-05/05-26-hyb-oa-delivery-trellis-only/prd.md
diff --git a/.trellis/tasks/05-26-hyb-oa-delivery-trellis-only/task.json b/.trellis/tasks/archive/2026-05/05-26-hyb-oa-delivery-trellis-only/task.json
similarity index 95%
rename from .trellis/tasks/05-26-hyb-oa-delivery-trellis-only/task.json
rename to .trellis/tasks/archive/2026-05/05-26-hyb-oa-delivery-trellis-only/task.json
index 4abd80f2..e97b9c8a 100644
--- a/.trellis/tasks/05-26-hyb-oa-delivery-trellis-only/task.json
+++ b/.trellis/tasks/archive/2026-05/05-26-hyb-oa-delivery-trellis-only/task.json
@@ -3,7 +3,7 @@
   "name": "hyb-oa-delivery-trellis-only",
   "title": "Remove hyb-oa delivery skill and enforce Trellis-only governance",
   "description": "Remove the project-local hyb-oa-delivery skill and make Trellis workflow/spec/tasks/docs the single governance entry point.",
-  "status": "in_progress",
+  "status": "completed",
   "dev_type": "docs",
   "scope": "trellis-governance",
   "package": "docs",
@@ -11,7 +11,7 @@
   "creator": "shunli",
   "assignee": "shunli",
   "createdAt": "2026-05-26",
-  "completedAt": null,
+  "completedAt": "2026-05-26",
   "branch": null,
   "base_branch": "main",
   "worktree_path": null,