diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
new file mode 100644
index 0000000..e6288d4
--- /dev/null
+++ b/.claude-plugin/marketplace.json
@@ -0,0 +1,24 @@
+{
+  "name": "google-ai-assisted-cicd",
+  "metadata": {
+    "description": "Advanced CI/CD pipeline management for Claude Code."
+  },
+  "owner": {
+    "name": "Google LLC"
+  },
+  "plugins": [
+    {
+      "name": "cicd",
+      "source": "./",
+      "description": "Advanced CI/CD pipeline management for Claude Code.",
+      "category": "Automation",
+      "tags": [
+        "cicd",
+        "deployment",
+        "pipeline design",
+        "terraform",
+        "canary release"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.claude-plugin/plugin.json b/.claude-plugin/plugin.json
new file mode 100644
index 0000000..bb4bbfd
--- /dev/null
+++ b/.claude-plugin/plugin.json
@@ -0,0 +1,21 @@
+{
+  "name": "cicd",
+  "version": "0.2.2",
+  "description": "The CI/CD extension provides Gemini powered AI assisted CI/CD. It supports deployment to Cloud Run and Cloud Storage as well as creation of a robust CI/CD pipeline.",
+  "author": {
+    "name": "Google LLC"
+  },
+  "homepage": "https://github.com/gemini-cli-extensions/cicd",
+  "license": "Apache-2.0",
+  "repository": "https://github.com/gemini-cli-extensions/cicd",
+  "skills": "./skills/",
+  "mcpServers": {
+    "cicd-mcp": {
+      "command": "npx",
+      "args": [
+        "-y",
+        "@google-cloud/cicd-mcp"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/.mcp.json b/.mcp.json
index 7c740f4..67698ac 100644
--- a/.mcp.json
+++ b/.mcp.json
@@ -1,7 +1,11 @@
 {
   "mcpServers": {
-    "google-cicd": {
-      "command": "npx @google-cloud/cicd-mcp"
+    "cicd-mcp": {
+      "command": "npx",
+      "args": [
+        "-y",
+        "@google-cloud/cicd-mcp"
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/README.md b/README.md
index 738615e..353d9ca 100644
--- a/README.md
+++ b/README.md
@@ -23,18 +23,8 @@ The CI/CD extension for Gemini CLI automates Continuous Integration and Continuo
 
 ## ⚙️ Installation
 
-To install the CI/CD extension, run the following command in your terminal:
-
-```bash
-gemini extensions install https://github.com/gemini-cli-extensions/cicd
-```
+### ✅ Prerequisites
 
-*To install development build add `--ref=nightly --pre-release` flags.*
-
-## ✅ Prerequisites
-
-*   [Gemini CLI](https://github.com/google-gemini/gemini-cli): Version **v0.15.0 or newer** must be installed.
-*   Gemini CLI Authentication: Ensure you have configured [Authentication Options](https://github.com/google-gemini/gemini-cli/tree/main?tab=readme-ov-file#-authentication-options).
 *   `gcloud` CLI: The Google Cloud CLI must be [installed](https://cloud.google.com/sdk/docs/install) and available in your system's PATH.
 *   Google Cloud Project: You need a Google Cloud project with the necessary APIs enabled. Depending on your usage, the extension may require:
     *   Cloud Build API
@@ -51,6 +41,46 @@ gemini extensions install https://github.com/gemini-cli-extensions/cicd
     gcloud auth application-default login
     ```
 
+### Using Gemini CLI
+To install the CI/CD extension, run the following command in your terminal:
+
+```bash
+gemini extensions install https://github.com/gemini-cli-extensions/cicd
+```
+
+*To install development build add `--ref=nightly --pre-release` flags.*
+
+*   [Gemini CLI](https://github.com/google-gemini/gemini-cli): Version **v0.15.0 or newer** must be installed.
+*   Gemini CLI Authentication: Ensure you have configured [Authentication Options](https://github.com/google-gemini/gemini-cli/tree/main?tab=readme-ov-file#-authentication-options).
+
+
+### Using Claude Code
+To install the CI/CD extension, run the following command in your terminal:
+
+1. Add the Marketplace.
+
+```bash
+claude plugin marketplace add https://github.com/gemini-cli-extensions/cicd.git#v0.2.2
+```
+
+2. Install the Plugin.
+```bash
+claude plugin install cicd
+```
+
+### Using Antigravity
+To install our CI/CD extension in Antigravity, you can setup our MCP Server as custom MCP and add skills.
+
+1. Setup custom MCP server
+Follow the instructions at [Connecting Custom MCP Servers](https://antigravity.google/docs/mcp#connecting-custom-mcp-servers). Use the provided [.mcp.json](.mcp.json) file which contains our MCP server config.
+
+2. Add Skills
+You can use [Skills](https://github.com/vercel-labs/skills) to add skills to Antigravity. 
+```bash
+ npx skills add https://github.com/gemini-cli-extensions/cicd --global --all --agent antigravity
+```
+
+
 ## 🔒 Security Considerations
 
 > [!WARNING]
diff --git a/gemini-extension.json b/gemini-extension.json
index cc18329..b98737e 100644
--- a/gemini-extension.json
+++ b/gemini-extension.json
@@ -1,6 +1,6 @@
 {
   "name": "cicd",
-  "version": "0.1.1",
+  "version": "0.2.2",
   "description": "The CI/CD extension provides Gemini powered AI assisted CI/CD. It supports deployment to Cloud Run and Cloud Storage as well as creation of a robust CI/CD pipeline.",
   "mcpServers": {
     "cicd-mcp": {