diff --git a/plugins/clarity-assist/.claude-plugin/plugin.json b/plugins/clarity-assist/.claude-plugin/plugin.json
index 2875bd9..0cebf68 100644
--- a/plugins/clarity-assist/.claude-plugin/plugin.json
+++ b/plugins/clarity-assist/.claude-plugin/plugin.json
@@ -16,30 +16,6 @@
     "requirements",
     "methodology"
   ],
-  "commands": [
-    {
-      "name": "clarify",
-      "description": "Full 4-D prompt optimization (Deconstruct, Diagnose, Develop, Deliver)",
-      "file": "commands/clarify.md"
-    },
-    {
-      "name": "quick-clarify",
-      "description": "Rapid mode - single-pass clarification for simple requests",
-      "file": "commands/quick-clarify.md"
-    }
-  ],
-  "agents": [
-    {
-      "name": "clarity-coach",
-      "description": "ND-friendly coach for structured requirement gathering",
-      "file": "agents/clarity-coach.md"
-    }
-  ],
-  "skills": [
-    {
-      "name": "prompt-patterns",
-      "description": "Optimization rules and patterns for effective prompts",
-      "path": "skills/prompt-patterns"
-    }
-  ]
+  "commands": ["./commands/"],
+  "agents": ["./agents/"]
 }
diff --git a/plugins/git-flow/.claude-plugin/plugin.json b/plugins/git-flow/.claude-plugin/plugin.json
index c0b9d34..53bde29 100644
--- a/plugins/git-flow/.claude-plugin/plugin.json
+++ b/plugins/git-flow/.claude-plugin/plugin.json
@@ -16,60 +16,6 @@
     "branch",
     "automation"
   ],
-  "commands": [
-    {
-      "name": "commit",
-      "description": "Create a commit with auto-generated conventional message",
-      "file": "commands/commit.md"
-    },
-    {
-      "name": "commit-push",
-      "description": "Commit and push to remote in one operation",
-      "file": "commands/commit-push.md"
-    },
-    {
-      "name": "commit-merge",
-      "description": "Commit current changes and merge into target branch",
-      "file": "commands/commit-merge.md"
-    },
-    {
-      "name": "commit-sync",
-      "description": "Commit, push, and sync with upstream",
-      "file": "commands/commit-sync.md"
-    },
-    {
-      "name": "branch-start",
-      "description": "Start a new feature/fix/chore branch with naming convention",
-      "file": "commands/branch-start.md"
-    },
-    {
-      "name": "branch-cleanup",
-      "description": "Clean up merged branches locally and optionally remotely",
-      "file": "commands/branch-cleanup.md"
-    },
-    {
-      "name": "git-status",
-      "description": "Enhanced git status with recommendations",
-      "file": "commands/git-status.md"
-    },
-    {
-      "name": "git-config",
-      "description": "Configure git-flow settings for this project",
-      "file": "commands/git-config.md"
-    }
-  ],
-  "agents": [
-    {
-      "name": "git-assistant",
-      "description": "Git workflow assistant for complex operations",
-      "file": "agents/git-assistant.md"
-    }
-  ],
-  "skills": [
-    {
-      "name": "workflow-patterns",
-      "description": "Git branching strategies and workflow patterns",
-      "path": "skills/workflow-patterns"
-    }
-  ]
+  "commands": ["./commands/"],
+  "agents": ["./agents/"]
 }
diff --git a/plugins/pr-review/.claude-plugin/plugin.json b/plugins/pr-review/.claude-plugin/plugin.json
index 9a96b38..ddf2fad 100644
--- a/plugins/pr-review/.claude-plugin/plugin.json
+++ b/plugins/pr-review/.claude-plugin/plugin.json
@@ -16,56 +16,7 @@
     "performance",
     "multi-agent"
   ],
-  "commands": [
-    {
-      "name": "pr-review",
-      "description": "Full multi-agent PR review (security, performance, maintainability, tests)",
-      "file": "commands/pr-review.md"
-    },
-    {
-      "name": "pr-summary",
-      "description": "Quick summary of PR changes without full review",
-      "file": "commands/pr-summary.md"
-    },
-    {
-      "name": "pr-findings",
-      "description": "List and filter review findings by category or confidence",
-      "file": "commands/pr-findings.md"
-    }
-  ],
-  "agents": [
-    {
-      "name": "coordinator",
-      "description": "Orchestrates the multi-agent review process",
-      "file": "agents/coordinator.md"
-    },
-    {
-      "name": "security-reviewer",
-      "description": "Analyzes code for security vulnerabilities",
-      "file": "agents/security-reviewer.md"
-    },
-    {
-      "name": "performance-analyst",
-      "description": "Identifies performance issues and optimization opportunities",
-      "file": "agents/performance-analyst.md"
-    },
-    {
-      "name": "maintainability-auditor",
-      "description": "Reviews code quality, patterns, and maintainability",
-      "file": "agents/maintainability-auditor.md"
-    },
-    {
-      "name": "test-validator",
-      "description": "Validates test coverage and test quality",
-      "file": "agents/test-validator.md"
-    }
-  ],
-  "skills": [
-    {
-      "name": "review-patterns",
-      "description": "Code review patterns and confidence scoring rules",
-      "path": "skills/review-patterns"
-    }
-  ],
-  "mcpServers": ["gitea"]
+  "commands": ["./commands/"],
+  "agents": ["./agents/"],
+  "mcpServers": ["./.mcp.json"]
 }