diff --git a/docs/toolhive/reference/cli/thv.md b/docs/toolhive/reference/cli/thv.md
index 4eac7208..fdd48eab 100644
--- a/docs/toolhive/reference/cli/thv.md
+++ b/docs/toolhive/reference/cli/thv.md
@@ -35,6 +35,7 @@ thv [flags]
 
 ### SEE ALSO
 
+* [thv build](thv_build.md)	 - Build a container for an MCP server without running it
 * [thv client](thv_client.md)	 - Manage MCP clients
 * [thv config](thv_config.md)	 - Manage application configuration
 * [thv export](thv_export.md)	 - Export a workload's run configuration to a file
diff --git a/docs/toolhive/reference/cli/thv_build.md b/docs/toolhive/reference/cli/thv_build.md
new file mode 100644
index 00000000..a1fde7b3
--- /dev/null
+++ b/docs/toolhive/reference/cli/thv_build.md
@@ -0,0 +1,60 @@
+---
+title: thv build
+hide_title: true
+description: Reference for ToolHive CLI command `thv build`
+last_update:
+  author: autogenerated
+slug: thv_build
+mdx:
+  format: md
+---
+
+## thv build
+
+Build a container for an MCP server without running it
+
+### Synopsis
+
+Build a container for an MCP server using a protocol scheme without running it.
+
+ToolHive supports building containers from protocol schemes:
+
+	$ thv build uvx://package-name
+	$ thv build npx://package-name
+	$ thv build go://package-name
+	$ thv build go://./local-path
+
+Automatically generates a container that can run the specified package
+using either uvx (Python with uv package manager), npx (Node.js),
+or go (Golang). For Go, you can also specify local paths starting
+with './' or '../' to build local Go projects.
+
+The container will be built and tagged locally, ready to be used with 'thv run'
+or other container tools. The built image name will be displayed upon successful completion.
+
+Examples:
+	$ thv build uvx://mcp-server-git
+	$ thv build --tag my-custom-name:latest npx://@modelcontextprotocol/server-filesystem
+	$ thv build go://./my-local-server
+
+```
+thv build [flags] PROTOCOL
+```
+
+### Options
+
+```
+  -h, --help         help for build
+  -t, --tag string   Name and optionally a tag in the 'name:tag' format for the built image
+```
+
+### Options inherited from parent commands
+
+```
+      --debug   Enable debug mode
+```
+
+### SEE ALSO
+
+* [thv](thv.md)	 - ToolHive (thv) is a lightweight, secure, and fast manager for MCP servers
+
diff --git a/static/api-specs/toolhive-api.yaml b/static/api-specs/toolhive-api.yaml
index 9970ad4d..14acc2b1 100644
--- a/static/api-specs/toolhive-api.yaml
+++ b/static/api-specs/toolhive-api.yaml
@@ -153,6 +153,11 @@ components:
       properties:
         name:
           type: string
+        registered_clients:
+          items:
+            type: string
+          type: array
+          uniqueItems: false
       type: object
     ignore.Config:
       description: IgnoreConfig contains configuration for ignore processing