diff --git a/.claude/skills/add-apm-integrations/SKILL.md b/.claude/skills/add-apm-integrations/SKILL.md
index 2b8b79486ce..3998630c59f 100644
--- a/.claude/skills/add-apm-integrations/SKILL.md
+++ b/.claude/skills/add-apm-integrations/SKILL.md
@@ -1,14 +1,6 @@
 ---
 name: add-apm-integrations
-description: Write a new library instrumentation end-to-end. Use when the user ask to add a new APM integration or a library instrumentation.
-context: fork
-allowed-tools:
-  - Bash
-  - Read
-  - Write
-  - Edit
-  - Glob
-  - Grep
+description: "Use when adding a new APM integration or library instrumentation to dd-trace-java. Scaffolds the Gradle module, writes Instrumentation and Decorator classes with bytecode advice, creates JUnit 5 tests, and wires up the integration following all project conventions."
 ---
 
 Write a new APM end-to-end integration for dd-trace-java, based on library instrumentations, following all project conventions.
diff --git a/.claude/skills/migrate-junit-source-to-tabletest/SKILL.md b/.claude/skills/migrate-junit-source-to-tabletest/SKILL.md
index 062abd87d72..22760f1745c 100644
--- a/.claude/skills/migrate-junit-source-to-tabletest/SKILL.md
+++ b/.claude/skills/migrate-junit-source-to-tabletest/SKILL.md
@@ -1,6 +1,6 @@
 ---
 name: migrate-junit-source-to-tabletest
-description: Convert JUnit 5 @MethodSource/@CsvSource/@ValueSource parameterized tests to @TableTest (JDK8)
+description: "Use when converting JUnit 5 parameterized tests (@MethodSource, @CsvSource, @ValueSource) to @TableTest for JDK8 compatibility. Locates eligible test files, rewrites annotations with aligned table formatting, preserves test behavior, and verifies BUILD SUCCESSFUL."
 ---
 Goal: Migrate JUnit 5 parameterized tests using @MethodSource/@CsvSource/@ValueSource to @TableTest with minimal churn and passing tests.
 
diff --git a/.claude/skills/techdebt/SKILL.md b/.claude/skills/techdebt/SKILL.md
index 6929e6e2240..e26d6f84c43 100644
--- a/.claude/skills/techdebt/SKILL.md
+++ b/.claude/skills/techdebt/SKILL.md
@@ -1,13 +1,6 @@
 ---
 name: techdebt
-description: Analyze branch changes for technical debt, code duplication, and unnecessary complexity
-user-invocable: true
-context: fork
-allowed-tools:
-  - Bash
-  - Read
-  - Grep
-  - Glob
+description: "Use when reviewing branch changes for technical debt, code duplication, and unnecessary complexity. Diffs against the merge-base, identifies refactoring opportunities (dead code, over-abstraction, copy-paste logic), and applies fixes without changing behavior."
 ---
 
 # Techdebt Cleanup Skill