diff --git a/servers/com.grafana-mcp.json b/servers/com.grafana-mcp.json
new file mode 100644
index 0000000..845974f
--- /dev/null
+++ b/servers/com.grafana-mcp.json
@@ -0,0 +1,82 @@
+{
+  "$schema": "../schemas/server-definition.schema.json",
+  "id": "com.grafana-mcp",
+  "name": "Grafana",
+  "alias": "grafana",
+  "description": "Search dashboards, query Prometheus and Loki datasources, manage alerts, and investigate incidents through the official Grafana MCP server.",
+  "icon": "https://avatars.githubusercontent.com/u/7195757?v=4",
+  "schema_version": "2.1",
+  "categories": ["monitoring", "developer-tools"],
+  "tags": ["grafana", "monitoring", "dashboards", "prometheus", "loki", "alerts", "observability", "metrics"],
+
+  "transport": {
+    "type": "stdio",
+    "command": "docker",
+    "args": [
+      "run", "-i", "--rm",
+      "-e", "GRAFANA_URL",
+      "-e", "GRAFANA_SERVICE_ACCOUNT_TOKEN",
+      "grafana/mcp-grafana",
+      "-t", "stdio"
+    ],
+    "env": {
+      "GRAFANA_URL": "${input:GRAFANA_URL}",
+      "GRAFANA_SERVICE_ACCOUNT_TOKEN": "${input:GRAFANA_TOKEN}"
+    },
+    "metadata": {
+      "inputs": [
+        {
+          "id": "GRAFANA_URL",
+          "label": "Grafana URL",
+          "description": "URL of your Grafana instance. Include the protocol (http:// or https://).",
+          "type": "url",
+          "required": true,
+          "secret": false,
+          "placeholder": "http://localhost:3000"
+        },
+        {
+          "id": "GRAFANA_TOKEN",
+          "label": "Grafana Service Account Token",
+          "description": "Service account token with appropriate permissions. Create a service account with the Editor role for full read/write access.",
+          "type": "password",
+          "required": true,
+          "secret": true,
+          "placeholder": "glsa_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+          "obtain": {
+            "url": "https://grafana.com/docs/grafana/latest/administration/service-accounts/",
+            "instructions": "1. Go to your Grafana instance\n2. Navigate to Administration > Service accounts\n3. Click 'Add service account'\n4. Assign the 'Editor' role\n5. Click 'Add service account token'\n6. Copy the generated token (starts with glsa_)",
+            "button_label": "Learn More"
+          }
+        }
+      ]
+    }
+  },
+
+  "auth": {
+    "type": "api_key",
+    "instructions": "Create a service account token in your Grafana instance under Administration > Service accounts"
+  },
+
+  "contributor": {
+    "name": "Grafana Labs",
+    "github": "grafana",
+    "url": "https://grafana.com"
+  },
+
+  "links": {
+    "repository": "https://github.com/grafana/mcp-grafana",
+    "homepage": "https://grafana.com",
+    "documentation": "https://github.com/grafana/mcp-grafana#readme"
+  },
+
+  "platforms": ["all"],
+
+  "capabilities": {
+    "tools": true,
+    "resources": false,
+    "prompts": false,
+    "read_only_mode": false
+  },
+
+  "changelog_url": "https://github.com/grafana/mcp-grafana/releases"
+}