diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index e984083..ac0ee0e 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -244,6 +244,23 @@
       "category": "development",
       "version": "1.0.0"
     },
+    {
+      "name": "apify-generate-output-schema",
+      "source": "./skills/apify-generate-output-schema",
+      "skills": "./",
+      "description": "Generate output schemas (dataset_schema.json, output_schema.json, key_value_store_schema.json) for an Apify Actor by analyzing its source code",
+      "keywords": [
+        "apify",
+        "actor",
+        "output-schema",
+        "dataset-schema",
+        "key-value-store",
+        "schema-generation",
+        "development"
+      ],
+      "category": "development",
+      "version": "1.0.0"
+    },
     {
       "name": "apify-actor-commands",
       "description": "Commands for Apify Actor development workflow",
@@ -255,8 +272,7 @@
       "source": "./",
       "category": "development",
       "commands": [
-        "./commands/create-actor.md",
-        "./commands/generate-output-schema.md"
+        "./commands/create-actor.md"
       ]
     },
     {
diff --git a/README.md b/README.md
index 287d121..0966e2b 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ Official Apify Agent Skills for web scraping, data extraction, and automation. W
 | `apify-competitor-intelligence` | Analyze competitor strategies, content, pricing, ads, and market positioning across Google Maps, Booking.com, Facebook, Instagram, YouTube, and TikTok | [SKILL.md](skills/apify-competitor-intelligence/SKILL.md) |
 | `apify-content-analytics` | Track engagement metrics, measure campaign ROI, and analyze content performance across Instagram, Facebook, YouTube, and TikTok | [SKILL.md](skills/apify-content-analytics/SKILL.md) |
 | `apify-ecommerce` | Scrape e-commerce data for pricing intelligence, customer sentiment, product research, quality analysis, and supply chain monitoring across Amazon, Walmart, eBay, IKEA, and 50+ marketplaces | [SKILL.md](skills/apify-ecommerce/SKILL.md) |
+| `apify-generate-output-schema` | Generate output schemas (dataset_schema.json, output_schema.json, key_value_store_schema.json) for an Apify Actor by analyzing its source code | [SKILL.md](skills/apify-generate-output-schema/SKILL.md) |
 | `apify-influencer-discovery` | Find and evaluate influencers for brand partnerships, verify authenticity, and track collaboration performance across Instagram, Facebook, YouTube, and TikTok | [SKILL.md](skills/apify-influencer-discovery/SKILL.md) |
 | `apify-lead-generation` | Generate B2B/B2C leads by scraping Google Maps, websites, Instagram, TikTok, Facebook, LinkedIn, YouTube, and Google Search using Apify Actors | [SKILL.md](skills/apify-lead-generation/SKILL.md) |
 | `apify-market-research` | Analyze market conditions, geographic opportunities, pricing, consumer behavior, and product validation across Google Maps, Facebook, Instagram, Booking.com, and TripAdvisor | [SKILL.md](skills/apify-market-research/SKILL.md) |
diff --git a/agents/AGENTS.md b/agents/AGENTS.md
index 5de9e8b..8c168df 100644
--- a/agents/AGENTS.md
+++ b/agents/AGENTS.md
@@ -10,6 +10,7 @@ These skills are:
  - apify-competitor-intelligence -> "skills/apify-competitor-intelligence/SKILL.md"
  - apify-content-analytics -> "skills/apify-content-analytics/SKILL.md"
  - apify-ecommerce -> "skills/apify-ecommerce/SKILL.md"
+ - apify-generate-output-schema -> "skills/apify-generate-output-schema/SKILL.md"
  - apify-influencer-discovery -> "skills/apify-influencer-discovery/SKILL.md"
  - apify-lead-generation -> "skills/apify-lead-generation/SKILL.md"
  - apify-market-research -> "skills/apify-market-research/SKILL.md"
@@ -27,6 +28,7 @@ apify-brand-reputation-monitoring: `Track reviews, ratings, sentiment, and brand
 apify-competitor-intelligence: `Analyze competitor strategies, content, pricing, ads, and market positioning across Google Maps, Booking.com, Facebook, Instagram, YouTube, and TikTok.`
 apify-content-analytics: `Track engagement metrics, measure campaign ROI, and analyze content performance across Instagram, Facebook, YouTube, and TikTok.`
 apify-ecommerce: `Scrape e-commerce data for pricing intelligence, customer reviews, and seller discovery across Amazon, Walmart, eBay, IKEA, and 50+ marketplaces. Use when user asks to monitor prices, track competitors, analyze reviews, research products, or find sellers.`
+apify-generate-output-schema: `Generate output schemas (dataset_schema.json, output_schema.json, key_value_store_schema.json) for an Apify Actor by analyzing its source code. Use when creating or updating Actor output schemas.`
 apify-influencer-discovery: `Find and evaluate influencers for brand partnerships, verify authenticity, and track collaboration performance across Instagram, Facebook, YouTube, and TikTok.`
 apify-lead-generation: `Generates B2B/B2C leads by scraping Google Maps, websites, Instagram, TikTok, Facebook, LinkedIn, YouTube, and Google Search. Use when user asks to find leads, prospects, businesses, build lead lists, enrich contacts, or scrape profiles for sales outreach.`
 apify-market-research: `Analyze market conditions, geographic opportunities, pricing, consumer behavior, and product validation across Google Maps, Facebook, Instagram, Booking.com, and TripAdvisor.`
diff --git a/commands/generate-output-schema.md b/skills/apify-generate-output-schema/SKILL.md
similarity index 99%
rename from commands/generate-output-schema.md
rename to skills/apify-generate-output-schema/SKILL.md
index 6a62d19..d305935 100644
--- a/commands/generate-output-schema.md
+++ b/skills/apify-generate-output-schema/SKILL.md
@@ -1,6 +1,6 @@
 ---
-description: Generate output schemas (dataset_schema.json, output_schema.json, key_value_store_schema.json) for an Apify Actor by analyzing its source code
-argument-hint: Optional path to Actor directory or description of Actor output
+name: apify-generate-output-schema
+description: Generate output schemas (dataset_schema.json, output_schema.json, key_value_store_schema.json) for an Apify Actor by analyzing its source code. Use when creating or updating Actor output schemas.
 ---
 
 # Generate Actor Output Schema