diff --git a/docs/toolhive/reference/cli/thv_serve.md b/docs/toolhive/reference/cli/thv_serve.md
index cbdee01f..ec160dac 100644
--- a/docs/toolhive/reference/cli/thv_serve.md
+++ b/docs/toolhive/reference/cli/thv_serve.md
@@ -24,6 +24,9 @@ thv serve [flags]
 ### Options
 
 ```
+      --experimental-mcp                EXPERIMENTAL: Enable embedded MCP server for controlling ToolHive
+      --experimental-mcp-host string    EXPERIMENTAL: Host for the embedded MCP server (default "localhost")
+      --experimental-mcp-port string    EXPERIMENTAL: Port for the embedded MCP server (default "4483")
   -h, --help                            help for serve
       --host string                     Host address to bind the server to (default "127.0.0.1")
       --oidc-audience string            Expected audience for the token
diff --git a/static/api-specs/toolhive-api.yaml b/static/api-specs/toolhive-api.yaml
index bda3bde2..53a93b1c 100644
--- a/static/api-specs/toolhive-api.yaml
+++ b/static/api-specs/toolhive-api.yaml
@@ -976,11 +976,10 @@ components:
           type: array
           uniqueItems: false
         env_vars:
-          description: Environment variables to set in the container
-          items:
+          additionalProperties:
             type: string
-          type: array
-          uniqueItems: false
+          description: Environment variables to set in the container
+          type: object
         host:
           description: Host to bind to
           type: string