diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index ab54953d9f8..7da90ceb2a4 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -4,45 +4,13 @@
     "name": "Firebase",
     "email": "firebase-support@google.com"
   },
-  "metadata": {
-    "description": "Official Claude plugin for Firebase to help understand and manage your Firebase project, resources, and data",
-    "version": "1.0.0"
-  },
   "plugins": [
     {
       "name": "firebase",
-      "description": "Claude plugin for Firebase that installs the Firebase MCP server and helps to manage Firebase projects, add backend services, add AI features, deploy & host apps, and more",
-      "version": "1.0.0",
-      "author": {
-        "name": "Firebase",
-        "url": "https://firebase.google.com/"
-      },
-      "homepage": "https://github.com/firebase/firebase-tools",
-      "repository": "https://github.com/firebase/firebase-tools.git",
-      "license": "MIT",
-      "keywords": [
-        "firebase",
-        "mcp",
-        "cloud",
-        "firestore",
-        "database",
-        "hosting",
-        "functions",
-        "cli"
-      ],
+      "description": "Official Claude plugin for Firebase. Manage projects, add backend services, develop AI features, deploy & host apps, and more",
       "category": "development",
       "tags": ["firebase", "backend", "database", "cloud-services"],
-      "mcpServers": {
-        "firebase": {
-          "description": "Firebase MCP server for understanding and managing your Firebase project, resources, and data",
-          "command": "npx",
-          "args": ["-y", "firebase-tools", "mcp", "--dir", "."],
-          "env": {
-            "IS_FIREBASE_MCP": "true"
-          }
-        }
-      },
-      "source": "./"
+      "source": "./claude-plugins/firebase"
     }
   ]
 }
diff --git a/claude-plugins/firebase/.claude-plugin/plugin.json b/claude-plugins/firebase/.claude-plugin/plugin.json
new file mode 100644
index 00000000000..30fbf07c027
--- /dev/null
+++ b/claude-plugins/firebase/.claude-plugin/plugin.json
@@ -0,0 +1,13 @@
+{
+  "name": "firebase",
+  "description": "Official Claude plugin for Firebase. Manage projects, add backend services, develop AI features, deploy & host apps, and more",
+  "version": "1.1.0",
+  "author": {
+    "name": "Firebase",
+    "url": "https://firebase.google.com/"
+  },
+  "homepage": "https://github.com/firebase/firebase-tools",
+  "repository": "https://github.com/firebase/firebase-tools.git",
+  "license": "MIT",
+  "keywords": ["firebase", "mcp", "cloud", "firestore", "database", "hosting", "functions", "cli"]
+}
diff --git a/claude-plugins/firebase/.mcp.json b/claude-plugins/firebase/.mcp.json
new file mode 100644
index 00000000000..761db96619b
--- /dev/null
+++ b/claude-plugins/firebase/.mcp.json
@@ -0,0 +1,12 @@
+{
+  "mcpServers": {
+    "firebase": {
+      "description": "Firebase MCP server - understand and manage your Firebase project, resources, and data",
+      "command": "npx",
+      "args": ["-y", "firebase-tools", "mcp", "--dir", "."],
+      "env": {
+        "IS_FIREBASE_MCP": "true"
+      }
+    }
+  }
+}
diff --git a/claude-plugins/firebase/skills b/claude-plugins/firebase/skills
new file mode 120000
index 00000000000..5dcab58e15a
--- /dev/null
+++ b/claude-plugins/firebase/skills
@@ -0,0 +1 @@
+../../skills
\ No newline at end of file