diff --git a/.claude/skills/backend-patterns.md b/.claude/skills/backend-patterns/SKILL.md
similarity index 96%
rename from .claude/skills/backend-patterns.md
rename to .claude/skills/backend-patterns/SKILL.md
index 00262cb..17a6d0d 100644
--- a/.claude/skills/backend-patterns.md
+++ b/.claude/skills/backend-patterns/SKILL.md
@@ -1,3 +1,8 @@
+---
+name: backend-patterns
+description: DDD structure, caching, auth, error handling, and common backend patterns
+---
+
 # Backend Patterns
 
 ## Architecture
diff --git a/.claude/skills/pytest-patterns.md b/.claude/skills/pytest-patterns/SKILL.md
similarity index 93%
rename from .claude/skills/pytest-patterns.md
rename to .claude/skills/pytest-patterns/SKILL.md
index d67a5fd..bdf120a 100644
--- a/.claude/skills/pytest-patterns.md
+++ b/.claude/skills/pytest-patterns/SKILL.md
@@ -1,3 +1,8 @@
+---
+name: pytest-patterns
+description: Testing guidelines, fixtures, markers, and pytest best practices
+---
+
 # Pytest Patterns
 
 ## Running Tests
diff --git a/CLAUDE.md b/CLAUDE.md
index 8df78d6..c542631 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -7,9 +7,7 @@ This file provides guidance to Claude Code when working with code in this reposi
 Claude Code uses configuration files in `.claude/` directory:
 
 - **Rules**: [@.claude/rules.md](/.claude/rules.md) (Always loaded)
-- **Skills**: Available task-specific workflows (load on-demand via `.claude/skills/`)
-  - `backend-patterns` - DDD, caching, auth, error handling
-  - `pytest-patterns` - Testing guidelines
+- **Skills**: Available task-specific workflows (auto-discovered via `.claude/skills/*/SKILL.md` and `.claude/commands/*.md`)
 - **Agents**: Subagent configurations (spawn when needed via `.claude/agents/`)
   - `code-reviewer` - Code review criteria
   - `planner` - Planning workflow