diff --git a/.github/plugin/marketplace.json b/.github/plugin/marketplace.json
index d78d94b..6bb2b28 100644
--- a/.github/plugin/marketplace.json
+++ b/.github/plugin/marketplace.json
@@ -8,31 +8,31 @@
   },
   "plugins": [
     {
-      "name": "elastic-elasticsearch",
+      "name": "elasticsearch",
       "source": "./plugins/elasticsearch",
       "description": "Elasticsearch skills — ES|QL queries, data ingestion, security (authn, authz, audit), and troubleshooting",
       "version": "0.3.0"
     },
     {
-      "name": "elastic-kibana",
+      "name": "kibana",
       "source": "./plugins/kibana",
       "description": "Kibana skills — dashboards, alerting rules, connectors, Vega visualizations, Agent Builder, streams, and audit logging",
       "version": "0.3.0"
     },
     {
-      "name": "elastic-observability",
+      "name": "observability",
       "source": "./plugins/observability",
       "description": "Elastic Observability skills — OpenTelemetry instrumentation and migration (.NET, Java, Python), LLM observability, log search, SLOs, and service health",
       "version": "0.3.0"
     },
     {
-      "name": "elastic-security",
+      "name": "security",
       "source": "./plugins/security",
       "description": "Elastic Security skills — alert triage, case management, detection rule management, and sample data generation",
       "version": "0.3.0"
     },
     {
-      "name": "elastic-cloud",
+      "name": "cloud",
       "source": "./plugins/cloud",
       "description": "Elastic Cloud skills — project setup, access management, network security, and Serverless project lifecycle",
       "version": "0.3.0"
diff --git a/README.md b/README.md
index 0bd3b94..824e3fe 100644
--- a/README.md
+++ b/README.md
@@ -146,11 +146,11 @@ claude plugin marketplace add https://github.com/elastic/agent-skills
 Once added, install individual plugins by name:
 
 ```sh
-claude plugin install elastic-elasticsearch@elastic-agent-skills
-claude plugin install elastic-kibana@elastic-agent-skills
-claude plugin install elastic-observability@elastic-agent-skills
-claude plugin install elastic-security@elastic-agent-skills
-claude plugin install elastic-cloud@elastic-agent-skills
+claude plugin install elasticsearch@elastic-agent-skills
+claude plugin install kibana@elastic-agent-skills
+claude plugin install observability@elastic-agent-skills
+claude plugin install security@elastic-agent-skills
+claude plugin install cloud@elastic-agent-skills
 ```
 
 > [!NOTE]
@@ -175,11 +175,11 @@ copilot plugin marketplace add elastic/agent-skills
 Once added, install individual plugins by name:
 
 ```sh
-copilot plugin install elastic-elasticsearch@elastic-agent-skills
-copilot plugin install elastic-kibana@elastic-agent-skills
-copilot plugin install elastic-observability@elastic-agent-skills
-copilot plugin install elastic-security@elastic-agent-skills
-copilot plugin install elastic-cloud@elastic-agent-skills
+copilot plugin install elasticsearch@elastic-agent-skills
+copilot plugin install kibana@elastic-agent-skills
+copilot plugin install observability@elastic-agent-skills
+copilot plugin install security@elastic-agent-skills
+copilot plugin install cloud@elastic-agent-skills
 ```
 
 Or browse available plugins interactively inside a Copilot session:
@@ -310,7 +310,7 @@ copilot plugin update
 Update a specific plugin:
 
 ```sh
-copilot plugin update elastic-elasticsearch
+copilot plugin update elasticsearch
 ```
 
 ### npx
diff --git a/plugins/cloud/plugin.json b/plugins/cloud/plugin.json
index 4fe79ba..aaed65f 100644
--- a/plugins/cloud/plugin.json
+++ b/plugins/cloud/plugin.json
@@ -1,5 +1,5 @@
 {
-  "name": "elastic-cloud",
+  "name": "cloud",
   "description": "Elastic Cloud skills - project setup, access management, network security, and Serverless project lifecycle",
   "version": "0.3.0",
   "author": {
@@ -9,5 +9,6 @@
   "repository": "https://github.com/elastic/agent-skills",
   "homepage": "https://github.com/elastic/agent-skills/tree/main/plugins/cloud",
   "license": "Apache-2.0",
-  "keywords": ["cloud", "serverless", "elastic-cloud", "elastic"]
+  "keywords": ["cloud", "serverless", "elastic-cloud", "elastic"],
+  "skills": ["skills/"]
 }
diff --git a/plugins/elasticsearch/plugin.json b/plugins/elasticsearch/plugin.json
index 51af6bd..ae037c5 100644
--- a/plugins/elasticsearch/plugin.json
+++ b/plugins/elasticsearch/plugin.json
@@ -1,5 +1,5 @@
 {
-  "name": "elastic-elasticsearch",
+  "name": "elasticsearch",
   "description": "Elasticsearch skills for GitHub Copilot — translate natural language to ES|QL, ingest data, manage security (authn, authz, audit), and troubleshoot clusters.",
   "version": "0.3.0",
   "author": {
@@ -16,5 +16,6 @@
     "ingest",
     "security",
     "elastic"
-  ]
+  ],
+  "skills": ["skills/"]
 }
diff --git a/plugins/kibana/plugin.json b/plugins/kibana/plugin.json
index 2abc260..30933c3 100644
--- a/plugins/kibana/plugin.json
+++ b/plugins/kibana/plugin.json
@@ -1,5 +1,5 @@
 {
-  "name": "elastic-kibana",
+  "name": "kibana",
   "description": "Kibana skills - dashboards, alerting rules, connectors, Vega visualizations, Agent Builder, streams, and audit logging",
   "version": "0.3.0",
   "author": {
@@ -16,5 +16,6 @@
     "connectors",
     "vega",
     "elastic"
-  ]
+  ],
+  "skills": ["skills/"]
 }
diff --git a/plugins/observability/plugin.json b/plugins/observability/plugin.json
index e895ad8..6fe0239 100644
--- a/plugins/observability/plugin.json
+++ b/plugins/observability/plugin.json
@@ -1,5 +1,5 @@
 {
-  "name": "elastic-observability",
+  "name": "observability",
   "description": "Elastic Observability skills - OpenTelemetry instrumentation and migration (.NET, Java, Python), LLM observability, log search, SLOs, and service health",
   "version": "0.3.0",
   "author": {
@@ -16,5 +16,6 @@
     "logs",
     "slo",
     "elastic"
-  ]
+  ],
+  "skills": ["skills/"]
 }
diff --git a/plugins/security/plugin.json b/plugins/security/plugin.json
index d74dea1..a4ab879 100644
--- a/plugins/security/plugin.json
+++ b/plugins/security/plugin.json
@@ -1,5 +1,5 @@
 {
-  "name": "elastic-security",
+  "name": "security",
   "description": "Elastic Security skills - alert triage, case management, detection rule management, and sample data generation",
   "version": "0.3.0",
   "author": {
@@ -9,5 +9,6 @@
   "repository": "https://github.com/elastic/agent-skills",
   "homepage": "https://github.com/elastic/agent-skills/tree/main/plugins/security",
   "license": "Apache-2.0",
-  "keywords": ["security", "siem", "detection", "alerts", "cases", "elastic"]
+  "keywords": ["security", "siem", "detection", "alerts", "cases", "elastic"],
+  "skills": ["skills/"]
 }