diff --git a/.github/upstream-projects.yaml b/.github/upstream-projects.yaml
index 0f29253e..043fad36 100644
--- a/.github/upstream-projects.yaml
+++ b/.github/upstream-projects.yaml
@@ -29,7 +29,7 @@
 projects:
   - id: toolhive-registry-server
     repo: stacklok/toolhive-registry-server
-    version: v1.4.11
+    version: v1.4.12
     docs_paths:
       - docs/toolhive/guides-registry
       - docs/toolhive/concepts/registry-criteria.mdx
diff --git a/docs/toolhive/guides-registry/configuration.mdx b/docs/toolhive/guides-registry/configuration.mdx
index 0e93dab3..d65bf36d 100644
--- a/docs/toolhive/guides-registry/configuration.mdx
+++ b/docs/toolhive/guides-registry/configuration.mdx
@@ -443,7 +443,7 @@ Kubernetes workload discovery watches for annotations on
 [`MCPRemoteProxy`](../guides-k8s/remote-mcp-proxy.mdx), and
 [`VirtualMCPServer`](../guides-vmcp/configuration.mdx) resources.
 
-```yaml {7-16}
+```yaml {7-19}
 apiVersion: toolhive.stacklok.dev/v1beta1
 kind: MCPServer
 metadata:
@@ -455,6 +455,8 @@ metadata:
     toolhive.stacklok.dev/registry-url: 'https://mcp.example.com/servers/my-mcp-server'
     toolhive.stacklok.dev/registry-description: |
       Production MCP server for code analysis
+    toolhive.stacklok.dev/registry-icon: 'https://mcp.example.com/icons/code-analysis.svg'
+    toolhive.stacklok.dev/registry-category: 'developer-tools'
     toolhive.stacklok.dev/tool-definitions:
       '[{"name":"analyze_code","description":"Analyze code for potential
       issues","inputSchema":{"type":"object","properties":{"file":{"type":"string","description":"Path
@@ -471,6 +473,8 @@ spec:
 | `toolhive.stacklok.dev/registry-url`         | Yes      | The external endpoint URL for this server                                         |
 | `toolhive.stacklok.dev/registry-description` | Yes      | Description text displayed in registry listings                                   |
 | `toolhive.stacklok.dev/registry-title`       | No       | Human-friendly display name for the registry entry (overrides the generated name) |
+| `toolhive.stacklok.dev/registry-icon`        | No       | Icon URL displayed alongside the entry in registry listings                       |
+| `toolhive.stacklok.dev/registry-category`    | No       | Category label used to group and filter this entry (added as a ToolHive tag)      |
 | `toolhive.stacklok.dev/tools`                | No       | JSON array of tool name strings (e.g., `["get_weather","get_forecast"]`)          |
 | `toolhive.stacklok.dev/tool-definitions`     | No       | JSON array of tool definitions with MCP tool metadata (name, description, schema) |
 | `toolhive.stacklok.dev/authz-claims`         | No       | JSON object of authorization claims for per-entry visibility control              |