diff --git a/servers/com.buildkite-mcp-docker.json b/servers/com.buildkite-mcp-docker.json
new file mode 100644
index 0000000..39cdc27
--- /dev/null
+++ b/servers/com.buildkite-mcp-docker.json
@@ -0,0 +1,79 @@
+{
+  "$schema": "../schemas/server-definition.schema.json",
+  "id": "com.buildkite-mcp-docker",
+  "name": "Buildkite (Docker)",
+  "alias": "buildkite",
+  "description": "Manage Buildkite pipelines, builds, jobs, and agents. Trigger builds, view logs, manage clusters, and monitor CI/CD workflows.",
+  "icon": "https://avatars.githubusercontent.com/u/5055988?v=4",
+  "schema_version": "2.1",
+  "categories": [
+    "developer-tools"
+  ],
+  "tags": [
+    "buildkite",
+    "ci-cd",
+    "pipelines",
+    "builds",
+    "testing",
+    "deployment"
+  ],
+  "transport": {
+    "type": "stdio",
+    "command": "docker",
+    "args": [
+      "run",
+      "--pull=always",
+      "-q",
+      "-i",
+      "--rm",
+      "-e",
+      "BUILDKITE_API_TOKEN",
+      "buildkite/mcp-server",
+      "stdio"
+    ],
+    "env": {
+      "BUILDKITE_API_TOKEN": "${input:BUILDKITE_API_TOKEN}"
+    },
+    "metadata": {
+      "inputs": [
+        {
+          "id": "BUILDKITE_API_TOKEN",
+          "label": "Buildkite API Token",
+          "description": "API access token for the Buildkite REST API.",
+          "type": "text",
+          "required": true,
+          "secret": true,
+          "placeholder": "bkua_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+          "obtain": {
+            "url": "https://buildkite.com/user/api-access-tokens",
+            "instructions": "1. Go to buildkite.com > Personal Settings > API Access Tokens\n2. Click 'New API Access Token'\n3. Configure organization access and scopes\n4. Click 'Create Token' and copy it",
+            "button_label": "Create Token"
+          }
+        }
+      ]
+    }
+  },
+  "auth": {
+    "type": "api_key",
+    "instructions": "Create an API access token at https://buildkite.com/user/api-access-tokens"
+  },
+  "contributor": {
+    "name": "Buildkite",
+    "github": "buildkite",
+    "url": "https://buildkite.com"
+  },
+  "links": {
+    "repository": "https://github.com/buildkite/buildkite-mcp-server",
+    "homepage": "https://buildkite.com",
+    "documentation": "https://buildkite.com/docs/apis/mcp-server"
+  },
+  "platforms": [
+    "all"
+  ],
+  "capabilities": {
+    "tools": true,
+    "resources": false,
+    "prompts": false,
+    "read_only_mode": false
+  }
+}