diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
new file mode 100644
index 0000000..afe0916
--- /dev/null
+++ b/.claude-plugin/marketplace.json
@@ -0,0 +1,20 @@
+{
+  "name": "mittwald-agent-skills",
+  "description": "Collection of Mittwald skills for the Claude plugin system.",
+  "owner": {
+    "name": "Mittwald CM Service GmbH & Co. KG",
+    "url": "https://www.mittwald.de"
+  },
+  "plugins": [
+    {
+      "name": "mittwald-migrate",
+      "source": "./skills/mittwald-migrate",
+      "description": "Guides a conversational, phase-by-phase migration of an application to Mittwald mStudio."
+    },
+    {
+      "name": "mittwald-zerodeploy",
+      "source": "./skills/mittwald-zerodeploy",
+      "description": "Zero-config deployment to Mittwald mStudio container hosting using Railpack build inference."
+    }
+  ]
+}
diff --git a/README.md b/README.md
index d2a6438..06a426a 100644
--- a/README.md
+++ b/README.md
@@ -49,8 +49,8 @@ Before using either skill:
 
 ```bash
 /plugin marketplace add mittwald/agent-skills
-/plugin install mittwald-migrate@agent-skills
-/plugin install mittwald-zerodeploy-skill@agent-skills
+/plugin install mittwald-migrate@mittwald-agent-skills
+/plugin install mittwald-zerodeploy@mittwald-agent-skills
 ```
 
 **For any other AI assistant** — use the [`skills`](https://www.npmjs.com/package/skills) CLI:
diff --git a/.claude-plugin/plugin.json b/skills/mittwald-migrate/.claude-plugin/plugin.json
similarity index 65%
rename from .claude-plugin/plugin.json
rename to skills/mittwald-migrate/.claude-plugin/plugin.json
index 396c357..056f5eb 100644
--- a/.claude-plugin/plugin.json
+++ b/skills/mittwald-migrate/.claude-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
-  "name": "agent-skills",
-  "description": "Collection of mittwald skills for the Claude plugin system.",
+  "name": "mittwald-migrate",
+  "description": "Guides a conversational, phase-by-phase migration of an application to Mittwald mStudio.",
   "version": "0.1.0",
   "author": {
     "name": "Mittwald CM Service GmbH & Co. KG",
diff --git a/skills/mittwald-zerodeploy/.claude-plugin/plugin.json b/skills/mittwald-zerodeploy/.claude-plugin/plugin.json
new file mode 100644
index 0000000..ff395e7
--- /dev/null
+++ b/skills/mittwald-zerodeploy/.claude-plugin/plugin.json
@@ -0,0 +1,12 @@
+{
+  "name": "mittwald-zerodeploy",
+  "description": "Zero-config deployment to Mittwald mStudio container hosting using Railpack build inference.",
+  "version": "0.1.0",
+  "author": {
+    "name": "Mittwald CM Service GmbH & Co. KG",
+    "url": "https://www.mittwald.de"
+  },
+  "homepage": "https://github.com/mittwald/agent-skills",
+  "repository": "https://github.com/mittwald/agent-skills",
+  "license": "MIT"
+}