diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index bb9248a..fb54b61 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -1,76 +1,200 @@
 {
-  "name": "core-agent",
-  "description": "Host UK Claude Code plugin collection",
+  "$schema": "https://anthropic.com/claude-code/marketplace.schema.json",
+  "name": "host-uk",
+  "description": "Host UK development plugins for Claude Code, Codex, and Gemini",
   "owner": {
     "name": "Host UK",
     "email": "hello@host.uk.com"
   },
   "plugins": [
     {
-      "name": "api",
-      "source": "./claude/api",
+      "name": "claude-api",
       "description": "API client generation helpers",
-      "version": "0.1.0"
+      "version": "0.1.0",
+      "source": "./claude/api",
+      "category": "development"
     },
     {
-      "name": "ci",
-      "source": "./claude/ci",
+      "name": "claude-ci",
       "description": "CI integration - GitHub Actions, test automation",
-      "version": "0.1.0"
+      "version": "0.1.0",
+      "source": "./claude/ci",
+      "category": "workflow"
     },
     {
-      "name": "code",
-      "source": "./claude/code",
+      "name": "claude-code",
       "description": "Core development plugin - hooks, formatting, autonomous workflows",
-      "version": "0.1.0"
+      "version": "0.1.0",
+      "source": "./claude/code",
+      "category": "development"
     },
     {
-      "name": "collect",
-      "source": "./claude/collect",
+      "name": "claude-collect",
       "description": "Data collection via Borg CLI - /collect:github, /collect:website, /collect:excavate, /collect:papers",
-      "version": "0.1.0"
+      "version": "0.1.0",
+      "source": "./claude/collect",
+      "category": "data-collection"
     },
     {
-      "name": "coolify",
-      "source": "./claude/coolify",
+      "name": "claude-coolify",
       "description": "Coolify deployment helpers",
-      "version": "0.1.0"
+      "version": "0.1.0",
+      "source": "./claude/coolify",
+      "category": "deployment"
     },
     {
-      "name": "core",
-      "source": "./claude/core",
+      "name": "claude-core",
       "description": "Core commands for project maintenance",
-      "version": "0.1.0"
+      "version": "0.1.0",
+      "source": "./claude/core",
+      "category": "workflow"
     },
     {
-      "name": "issue",
-      "source": "./claude/issue",
+      "name": "claude-issue",
       "description": "Integration with GitHub Issues",
-      "version": "0.1.0"
+      "version": "0.1.0",
+      "source": "./claude/issue",
+      "category": "productivity"
     },
     {
-      "name": "perf",
-      "source": "./claude/perf",
+      "name": "claude-perf",
       "description": "Performance profiling helpers for Go and PHP",
-      "version": "0.1.0"
+      "version": "0.1.0",
+      "source": "./claude/perf",
+      "category": "monitoring"
     },
     {
-      "name": "qa",
-      "source": "./claude/qa",
+      "name": "claude-qa",
       "description": "Quality assurance - iterative fix loops, lint enforcement",
-      "version": "0.1.0"
+      "version": "0.1.0",
+      "source": "./claude/qa",
+      "category": "testing"
     },
     {
-      "name": "review",
-      "source": "./claude/review",
+      "name": "claude-review",
       "description": "Code review automation - PR review, security checks",
-      "version": "0.1.0"
+      "version": "0.1.0",
+      "source": "./claude/review",
+      "category": "security"
     },
     {
-      "name": "verify",
-      "source": "./claude/verify",
+      "name": "claude-verify",
       "description": "Work verification - ensure tests pass, no debug statements",
-      "version": "0.1.0"
+      "version": "0.1.0",
+      "source": "./claude/verify",
+      "category": "testing"
+    },
+    {
+      "name": "codex",
+      "description": "Codex awareness, ethics modal, and guardrails",
+      "version": "0.1.1",
+      "source": "./codex",
+      "category": "ethics"
+    },
+    {
+      "name": "codex-awareness",
+      "description": "Codex awareness guidance for the core-agent monorepo",
+      "version": "0.1.1",
+      "source": "./codex/awareness",
+      "category": "productivity"
+    },
+    {
+      "name": "codex-ethics",
+      "description": "Ethics modal and axioms kernel for Codex",
+      "version": "0.1.1",
+      "source": "./codex/ethics",
+      "category": "ethics"
+    },
+    {
+      "name": "codex-guardrails",
+      "description": "Safety guardrails with a focus on safe string handling",
+      "version": "0.1.1",
+      "source": "./codex/guardrails",
+      "category": "security"
+    },
+    {
+      "name": "codex-api",
+      "description": "Codex API plugin",
+      "version": "0.1.1",
+      "source": "./codex/api",
+      "category": "development"
+    },
+    {
+      "name": "codex-ci",
+      "description": "Codex CI plugin",
+      "version": "0.1.1",
+      "source": "./codex/ci",
+      "category": "workflow"
+    },
+    {
+      "name": "codex-code",
+      "description": "Codex code workflow plugin",
+      "version": "0.1.1",
+      "source": "./codex/code",
+      "category": "development"
+    },
+    {
+      "name": "codex-collect",
+      "description": "Codex collection plugin",
+      "version": "0.1.1",
+      "source": "./codex/collect",
+      "category": "data-collection"
+    },
+    {
+      "name": "codex-coolify",
+      "description": "Codex Coolify plugin",
+      "version": "0.1.1",
+      "source": "./codex/coolify",
+      "category": "deployment"
+    },
+    {
+      "name": "codex-core",
+      "description": "Codex core plugin",
+      "version": "0.1.1",
+      "source": "./codex/core",
+      "category": "workflow"
+    },
+    {
+      "name": "codex-issue",
+      "description": "Codex issue plugin",
+      "version": "0.1.1",
+      "source": "./codex/issue",
+      "category": "productivity"
+    },
+    {
+      "name": "codex-perf",
+      "description": "Codex performance plugin",
+      "version": "0.1.1",
+      "source": "./codex/perf",
+      "category": "monitoring"
+    },
+    {
+      "name": "codex-qa",
+      "description": "Codex QA plugin",
+      "version": "0.1.1",
+      "source": "./codex/qa",
+      "category": "testing"
+    },
+    {
+      "name": "codex-review",
+      "description": "Codex review plugin",
+      "version": "0.1.1",
+      "source": "./codex/review",
+      "category": "security"
+    },
+    {
+      "name": "codex-verify",
+      "description": "Codex verify plugin",
+      "version": "0.1.1",
+      "source": "./codex/verify",
+      "category": "testing"
+    },
+    {
+      "name": "gemini-core-agent",
+      "description": "Host UK Core Agent Extension for Gemini CLI",
+      "version": "0.1.1",
+      "source": "./google/gemini-cli",
+      "category": "development"
     }
   ]
 }