diff --git a/docs/toolhive/reference/crds/embeddingserver.mdx b/docs/toolhive/reference/crds/embeddingserver.mdx
index b47e7051..ef1139db 100644
--- a/docs/toolhive/reference/crds/embeddingserver.mdx
+++ b/docs/toolhive/reference/crds/embeddingserver.mdx
@@ -8,13 +8,13 @@ toc_max_heading_level: 4
 
 `EmbeddingServer` defines a containerized embedding model server managed by the ToolHive operator. The [VirtualMCPServer](./virtualmcpserver.mdx) optimizer references an `EmbeddingServer` to generate vector embeddings for tool discovery.
 
-**API:** `toolhive.stacklok.dev/v1alpha1`
+**API:** `toolhive.stacklok.dev/v1beta1`
  · **Scope:** Namespaced · **Short names:** `emb`, `embedding`
 
 ## Example
 
 ```yaml title="embeddingserver.yaml"
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: EmbeddingServer
 metadata:
   name: my-embeddingserver
diff --git a/docs/toolhive/reference/crds/mcpexternalauthconfig.mdx b/docs/toolhive/reference/crds/mcpexternalauthconfig.mdx
index 21386526..6d277afc 100644
--- a/docs/toolhive/reference/crds/mcpexternalauthconfig.mdx
+++ b/docs/toolhive/reference/crds/mcpexternalauthconfig.mdx
@@ -8,13 +8,13 @@ toc_max_heading_level: 4
 
 `MCPExternalAuthConfig` configures how an MCP server or proxy authenticates to external services via token exchange or an embedded authorization server. It is referenced by [MCPServer](./mcpserver.mdx), [MCPRemoteProxy](./mcpremoteproxy.mdx), [MCPServerEntry](./mcpserverentry.mdx), and [VirtualMCPServer](./virtualmcpserver.mdx).
 
-**API:** `toolhive.stacklok.dev/v1alpha1`
+**API:** `toolhive.stacklok.dev/v1beta1`
  · **Scope:** Namespaced · **Short names:** `extauth`, `mcpextauth`
 
 ## Example
 
 ```yaml title="mcpexternalauthconfig.yaml"
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: MCPExternalAuthConfig
 metadata:
   name: my-mcpexternalauthconfig
diff --git a/docs/toolhive/reference/crds/mcpgroup.mdx b/docs/toolhive/reference/crds/mcpgroup.mdx
index 58858fdc..afaef5a0 100644
--- a/docs/toolhive/reference/crds/mcpgroup.mdx
+++ b/docs/toolhive/reference/crds/mcpgroup.mdx
@@ -8,13 +8,13 @@ toc_max_heading_level: 4
 
 `MCPGroup` is a grouping construct for backend workloads. Other resources reference an `MCPGroup` by name to join a shared pool - for example, a [VirtualMCPServer](./virtualmcpserver.mdx) aggregates the tools exposed by every member of its referenced group.
 
-**API:** `toolhive.stacklok.dev/v1alpha1`
+**API:** `toolhive.stacklok.dev/v1beta1`
  · **Scope:** Namespaced · **Short names:** `mcpg`, `mcpgroup`
 
 ## Example
 
 ```yaml title="mcpgroup.yaml"
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: MCPGroup
 metadata:
   name: my-mcpgroup
diff --git a/docs/toolhive/reference/crds/mcpoidcconfig.mdx b/docs/toolhive/reference/crds/mcpoidcconfig.mdx
index bd1b3abb..6378e1dc 100644
--- a/docs/toolhive/reference/crds/mcpoidcconfig.mdx
+++ b/docs/toolhive/reference/crds/mcpoidcconfig.mdx
@@ -8,13 +8,13 @@ toc_max_heading_level: 4
 
 `MCPOIDCConfig` defines OIDC authentication settings that can be shared across multiple MCP workloads. [MCPServer](./mcpserver.mdx), [MCPRemoteProxy](./mcpremoteproxy.mdx), and [VirtualMCPServer](./virtualmcpserver.mdx) reference an `MCPOIDCConfig` via `spec.oidcConfigRef` to validate incoming tokens.
 
-**API:** `toolhive.stacklok.dev/v1alpha1`
+**API:** `toolhive.stacklok.dev/v1beta1`
  · **Scope:** Namespaced · **Short names:** `mcpoidc`
 
 ## Example
 
 ```yaml title="mcpoidcconfig.yaml"
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: MCPOIDCConfig
 metadata:
   name: my-mcpoidcconfig
diff --git a/docs/toolhive/reference/crds/mcpregistry.mdx b/docs/toolhive/reference/crds/mcpregistry.mdx
index bce1f42a..65d494ed 100644
--- a/docs/toolhive/reference/crds/mcpregistry.mdx
+++ b/docs/toolhive/reference/crds/mcpregistry.mdx
@@ -8,13 +8,13 @@ toc_max_heading_level: 4
 
 `MCPRegistry` deploys a [ToolHive Registry Server](../../guides-registry/intro.mdx) in the cluster. The operator watches `MCPRegistry` resources and provisions the Registry Server, its PostgreSQL backing, and the configured sources (Git, ConfigMap, URL, or Kubernetes discovery) that populate its catalog of MCP server definitions.
 
-**API:** `toolhive.stacklok.dev/v1alpha1`
+**API:** `toolhive.stacklok.dev/v1beta1`
  · **Scope:** Namespaced · **Short names:** `mcpreg`, `registry`
 
 ## Example
 
 ```yaml title="mcpregistry.yaml"
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: MCPRegistry
 metadata:
   name: my-mcpregistry
diff --git a/docs/toolhive/reference/crds/mcpremoteproxy.mdx b/docs/toolhive/reference/crds/mcpremoteproxy.mdx
index c163513d..65c82f03 100644
--- a/docs/toolhive/reference/crds/mcpremoteproxy.mdx
+++ b/docs/toolhive/reference/crds/mcpremoteproxy.mdx
@@ -8,13 +8,13 @@ toc_max_heading_level: 4
 
 `MCPRemoteProxy` fronts a remote MCP server (reachable over HTTPS) with the same authentication, telemetry, and tool-filtering features that the operator applies to containerized servers. Use this when you want to apply ToolHive policies to a third-party hosted MCP endpoint.
 
-**API:** `toolhive.stacklok.dev/v1alpha1`
+**API:** `toolhive.stacklok.dev/v1beta1`
  · **Scope:** Namespaced · **Short names:** `rp`, `mcprp`
 
 ## Example
 
 ```yaml title="mcpremoteproxy.yaml"
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: MCPRemoteProxy
 metadata:
   name: my-mcpremoteproxy
diff --git a/docs/toolhive/reference/crds/mcpserver.mdx b/docs/toolhive/reference/crds/mcpserver.mdx
index 4489bfb7..9792fc40 100644
--- a/docs/toolhive/reference/crds/mcpserver.mdx
+++ b/docs/toolhive/reference/crds/mcpserver.mdx
@@ -8,13 +8,13 @@ toc_max_heading_level: 4
 
 `MCPServer` defines a containerized MCP server managed by the ToolHive Kubernetes operator. The operator watches `MCPServer` resources and reconciles them into a running, proxied MCP server with the configured transport, authentication, telemetry, and tool filtering.
 
-**API:** `toolhive.stacklok.dev/v1alpha1`
+**API:** `toolhive.stacklok.dev/v1beta1`
  · **Scope:** Namespaced · **Short names:** `mcpserver`, `mcpservers`
 
 ## Example
 
 ```yaml title="mcpserver.yaml"
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: MCPServer
 metadata:
   name: my-mcpserver
diff --git a/docs/toolhive/reference/crds/mcpserverentry.mdx b/docs/toolhive/reference/crds/mcpserverentry.mdx
index 60f07127..cb611bd8 100644
--- a/docs/toolhive/reference/crds/mcpserverentry.mdx
+++ b/docs/toolhive/reference/crds/mcpserverentry.mdx
@@ -8,13 +8,13 @@ toc_max_heading_level: 4
 
 `MCPServerEntry` declares a remote MCP server as a first-class member of an [MCPGroup](./mcpgroup.mdx) without running a full [MCPRemoteProxy](./mcpremoteproxy.mdx). Entries appear in registry listings and participate in group-scoped aggregations like a [VirtualMCPServer](./virtualmcpserver.mdx).
 
-**API:** `toolhive.stacklok.dev/v1alpha1`
+**API:** `toolhive.stacklok.dev/v1beta1`
  · **Scope:** Namespaced · **Short names:** `mcpentry`
 
 ## Example
 
 ```yaml title="mcpserverentry.yaml"
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: MCPServerEntry
 metadata:
   name: my-mcpserverentry
diff --git a/docs/toolhive/reference/crds/mcptelemetryconfig.mdx b/docs/toolhive/reference/crds/mcptelemetryconfig.mdx
index 23479459..b81e7bec 100644
--- a/docs/toolhive/reference/crds/mcptelemetryconfig.mdx
+++ b/docs/toolhive/reference/crds/mcptelemetryconfig.mdx
@@ -8,13 +8,13 @@ toc_max_heading_level: 4
 
 `MCPTelemetryConfig` defines telemetry settings that can be shared across multiple MCP workloads. [MCPServer](./mcpserver.mdx), [MCPRemoteProxy](./mcpremoteproxy.mdx), and [VirtualMCPServer](./virtualmcpserver.mdx) reference a single `MCPTelemetryConfig` to emit traces and metrics to a common backend.
 
-**API:** `toolhive.stacklok.dev/v1alpha1`
+**API:** `toolhive.stacklok.dev/v1beta1`
  · **Scope:** Namespaced · **Short names:** `mcpotel`
 
 ## Example
 
 ```yaml title="mcptelemetryconfig.yaml"
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: MCPTelemetryConfig
 metadata:
   name: my-mcptelemetryconfig
diff --git a/docs/toolhive/reference/crds/mcptoolconfig.mdx b/docs/toolhive/reference/crds/mcptoolconfig.mdx
index e20fe728..fe0c696c 100644
--- a/docs/toolhive/reference/crds/mcptoolconfig.mdx
+++ b/docs/toolhive/reference/crds/mcptoolconfig.mdx
@@ -8,13 +8,13 @@ toc_max_heading_level: 4
 
 `MCPToolConfig` defines tool-filtering and renaming rules that can be shared across MCP workloads. [MCPServer](./mcpserver.mdx), [MCPRemoteProxy](./mcpremoteproxy.mdx), and [VirtualMCPServer](./virtualmcpserver.mdx) reference an `MCPToolConfig` via `spec.toolConfigRef` to customize the tool surface their clients see.
 
-**API:** `toolhive.stacklok.dev/v1alpha1`
+**API:** `toolhive.stacklok.dev/v1beta1`
  · **Scope:** Namespaced · **Short names:** `tc`, `toolconfig`
 
 ## Example
 
 ```yaml title="mcptoolconfig.yaml"
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: MCPToolConfig
 metadata:
   name: my-mcptoolconfig
diff --git a/docs/toolhive/reference/crds/virtualmcpcompositetooldefinition.mdx b/docs/toolhive/reference/crds/virtualmcpcompositetooldefinition.mdx
index fc942327..07ca47c7 100644
--- a/docs/toolhive/reference/crds/virtualmcpcompositetooldefinition.mdx
+++ b/docs/toolhive/reference/crds/virtualmcpcompositetooldefinition.mdx
@@ -8,13 +8,13 @@ toc_max_heading_level: 4
 
 `VirtualMCPCompositeToolDefinition` defines a reusable composite tool workflow - a sequence of backend tool calls exposed to clients as a single high-level tool. Referenced by a [VirtualMCPServer](./virtualmcpserver.mdx) via `spec.config.compositeToolRefs`.
 
-**API:** `toolhive.stacklok.dev/v1alpha1`
+**API:** `toolhive.stacklok.dev/v1beta1`
  · **Scope:** Namespaced · **Short names:** `vmcpctd`, `compositetool`
 
 ## Example
 
 ```yaml title="virtualmcpcompositetooldefinition.yaml"
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: VirtualMCPCompositeToolDefinition
 metadata:
   name: my-virtualmcpcompositetooldefinition
diff --git a/docs/toolhive/reference/crds/virtualmcpserver.mdx b/docs/toolhive/reference/crds/virtualmcpserver.mdx
index 4d83ff49..b305ae6a 100644
--- a/docs/toolhive/reference/crds/virtualmcpserver.mdx
+++ b/docs/toolhive/reference/crds/virtualmcpserver.mdx
@@ -8,13 +8,13 @@ toc_max_heading_level: 4
 
 `VirtualMCPServer` (vMCP) aggregates the backend workloads belonging to an [MCPGroup](./mcpgroup.mdx) into a single endpoint. Clients see one MCP server; the operator handles tool aggregation, conflict resolution, auth, and optional composite tool workflows behind the scenes.
 
-**API:** `toolhive.stacklok.dev/v1alpha1`
+**API:** `toolhive.stacklok.dev/v1beta1`
  · **Scope:** Namespaced · **Short names:** `vmcp`, `virtualmcp`
 
 ## Example
 
 ```yaml title="virtualmcpserver.yaml"
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: VirtualMCPServer
 metadata:
   name: my-virtualmcpserver
diff --git a/static/api-specs/crds/embeddingservers.example.yaml b/static/api-specs/crds/embeddingservers.example.yaml
index 46b7e686..34b19103 100644
--- a/static/api-specs/crds/embeddingservers.example.yaml
+++ b/static/api-specs/crds/embeddingservers.example.yaml
@@ -1,4 +1,4 @@
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: EmbeddingServer
 metadata:
   name: my-embeddingserver
diff --git a/static/api-specs/crds/embeddingservers.schema.json b/static/api-specs/crds/embeddingservers.schema.json
index 8ddc9780..5b6d2253 100644
--- a/static/api-specs/crds/embeddingservers.schema.json
+++ b/static/api-specs/crds/embeddingservers.schema.json
@@ -4,7 +4,7 @@
   "description": "EmbeddingServer is the Schema for the embeddingservers API",
   "x-kubernetes-group": "toolhive.stacklok.dev",
   "x-kubernetes-kind": "EmbeddingServer",
-  "x-kubernetes-version": "v1alpha1",
+  "x-kubernetes-version": "v1beta1",
   "x-kubernetes-plural": "embeddingservers",
   "x-kubernetes-short-names": [
     "emb",
diff --git a/static/api-specs/crds/index.json b/static/api-specs/crds/index.json
index cd98ea98..df6b84a2 100644
--- a/static/api-specs/crds/index.json
+++ b/static/api-specs/crds/index.json
@@ -3,7 +3,7 @@
     "kind": "EmbeddingServer",
     "plural": "embeddingservers",
     "group": "toolhive.stacklok.dev",
-    "version": "v1alpha1",
+    "version": "v1beta1",
     "shortNames": [
       "emb",
       "embedding"
@@ -25,7 +25,7 @@
     "kind": "MCPExternalAuthConfig",
     "plural": "mcpexternalauthconfigs",
     "group": "toolhive.stacklok.dev",
-    "version": "v1alpha1",
+    "version": "v1beta1",
     "shortNames": [
       "extauth",
       "mcpextauth"
@@ -68,7 +68,7 @@
     "kind": "MCPGroup",
     "plural": "mcpgroups",
     "group": "toolhive.stacklok.dev",
-    "version": "v1alpha1",
+    "version": "v1beta1",
     "shortNames": [
       "mcpg",
       "mcpgroup"
@@ -109,7 +109,7 @@
     "kind": "MCPOIDCConfig",
     "plural": "mcpoidcconfigs",
     "group": "toolhive.stacklok.dev",
-    "version": "v1alpha1",
+    "version": "v1beta1",
     "shortNames": [
       "mcpoidc"
     ],
@@ -142,7 +142,7 @@
     "kind": "MCPRegistry",
     "plural": "mcpregistries",
     "group": "toolhive.stacklok.dev",
-    "version": "v1alpha1",
+    "version": "v1beta1",
     "shortNames": [
       "mcpreg",
       "registry"
@@ -157,7 +157,7 @@
     "kind": "MCPRemoteProxy",
     "plural": "mcpremoteproxies",
     "group": "toolhive.stacklok.dev",
-    "version": "v1alpha1",
+    "version": "v1beta1",
     "shortNames": [
       "rp",
       "mcprp"
@@ -204,7 +204,7 @@
     "kind": "MCPServerEntry",
     "plural": "mcpserverentries",
     "group": "toolhive.stacklok.dev",
-    "version": "v1alpha1",
+    "version": "v1beta1",
     "shortNames": [
       "mcpentry"
     ],
@@ -231,7 +231,7 @@
     "kind": "MCPServer",
     "plural": "mcpservers",
     "group": "toolhive.stacklok.dev",
-    "version": "v1alpha1",
+    "version": "v1beta1",
     "shortNames": [
       "mcpserver",
       "mcpservers"
@@ -278,7 +278,7 @@
     "kind": "MCPTelemetryConfig",
     "plural": "mcptelemetryconfigs",
     "group": "toolhive.stacklok.dev",
-    "version": "v1alpha1",
+    "version": "v1beta1",
     "shortNames": [
       "mcpotel"
     ],
@@ -311,7 +311,7 @@
     "kind": "MCPToolConfig",
     "plural": "mcptoolconfigs",
     "group": "toolhive.stacklok.dev",
-    "version": "v1alpha1",
+    "version": "v1beta1",
     "shortNames": [
       "tc",
       "toolconfig"
@@ -345,7 +345,7 @@
     "kind": "VirtualMCPCompositeToolDefinition",
     "plural": "virtualmcpcompositetooldefinitions",
     "group": "toolhive.stacklok.dev",
-    "version": "v1alpha1",
+    "version": "v1beta1",
     "shortNames": [
       "vmcpctd",
       "compositetool"
@@ -367,7 +367,7 @@
     "kind": "VirtualMCPServer",
     "plural": "virtualmcpservers",
     "group": "toolhive.stacklok.dev",
-    "version": "v1alpha1",
+    "version": "v1beta1",
     "shortNames": [
       "vmcp",
       "virtualmcp"
diff --git a/static/api-specs/crds/mcpexternalauthconfigs.example.yaml b/static/api-specs/crds/mcpexternalauthconfigs.example.yaml
index 77320fba..aef10ac3 100644
--- a/static/api-specs/crds/mcpexternalauthconfigs.example.yaml
+++ b/static/api-specs/crds/mcpexternalauthconfigs.example.yaml
@@ -1,4 +1,4 @@
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: MCPExternalAuthConfig
 metadata:
   name: my-mcpexternalauthconfig
diff --git a/static/api-specs/crds/mcpexternalauthconfigs.schema.json b/static/api-specs/crds/mcpexternalauthconfigs.schema.json
index b929346d..31241e25 100644
--- a/static/api-specs/crds/mcpexternalauthconfigs.schema.json
+++ b/static/api-specs/crds/mcpexternalauthconfigs.schema.json
@@ -4,7 +4,7 @@
   "description": "MCPExternalAuthConfig is the Schema for the mcpexternalauthconfigs API.\nMCPExternalAuthConfig resources are namespace-scoped and can only be referenced by\nMCPServer resources within the same namespace. Cross-namespace references\nare not supported for security and isolation reasons.",
   "x-kubernetes-group": "toolhive.stacklok.dev",
   "x-kubernetes-kind": "MCPExternalAuthConfig",
-  "x-kubernetes-version": "v1alpha1",
+  "x-kubernetes-version": "v1beta1",
   "x-kubernetes-plural": "mcpexternalauthconfigs",
   "x-kubernetes-short-names": [
     "extauth",
diff --git a/static/api-specs/crds/mcpgroups.example.yaml b/static/api-specs/crds/mcpgroups.example.yaml
index f0ce93e3..1c6dd73a 100644
--- a/static/api-specs/crds/mcpgroups.example.yaml
+++ b/static/api-specs/crds/mcpgroups.example.yaml
@@ -1,4 +1,4 @@
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: MCPGroup
 metadata:
   name: my-mcpgroup
diff --git a/static/api-specs/crds/mcpgroups.schema.json b/static/api-specs/crds/mcpgroups.schema.json
index f1f5a3c4..e827b3a1 100644
--- a/static/api-specs/crds/mcpgroups.schema.json
+++ b/static/api-specs/crds/mcpgroups.schema.json
@@ -4,7 +4,7 @@
   "description": "MCPGroup is the Schema for the mcpgroups API",
   "x-kubernetes-group": "toolhive.stacklok.dev",
   "x-kubernetes-kind": "MCPGroup",
-  "x-kubernetes-version": "v1alpha1",
+  "x-kubernetes-version": "v1beta1",
   "x-kubernetes-plural": "mcpgroups",
   "x-kubernetes-short-names": [
     "mcpg",
diff --git a/static/api-specs/crds/mcpoidcconfigs.example.yaml b/static/api-specs/crds/mcpoidcconfigs.example.yaml
index d59addeb..6e394fe1 100644
--- a/static/api-specs/crds/mcpoidcconfigs.example.yaml
+++ b/static/api-specs/crds/mcpoidcconfigs.example.yaml
@@ -1,4 +1,4 @@
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: MCPOIDCConfig
 metadata:
   name: my-mcpoidcconfig
diff --git a/static/api-specs/crds/mcpoidcconfigs.schema.json b/static/api-specs/crds/mcpoidcconfigs.schema.json
index 669d97df..158e894b 100644
--- a/static/api-specs/crds/mcpoidcconfigs.schema.json
+++ b/static/api-specs/crds/mcpoidcconfigs.schema.json
@@ -4,7 +4,7 @@
   "description": "MCPOIDCConfig is the Schema for the mcpoidcconfigs API.\nMCPOIDCConfig resources are namespace-scoped and can only be referenced by\nMCPServer resources within the same namespace. Cross-namespace references\nare not supported for security and isolation reasons.",
   "x-kubernetes-group": "toolhive.stacklok.dev",
   "x-kubernetes-kind": "MCPOIDCConfig",
-  "x-kubernetes-version": "v1alpha1",
+  "x-kubernetes-version": "v1beta1",
   "x-kubernetes-plural": "mcpoidcconfigs",
   "x-kubernetes-short-names": [
     "mcpoidc"
diff --git a/static/api-specs/crds/mcpregistries.example.yaml b/static/api-specs/crds/mcpregistries.example.yaml
index 5e941635..4ae55608 100644
--- a/static/api-specs/crds/mcpregistries.example.yaml
+++ b/static/api-specs/crds/mcpregistries.example.yaml
@@ -1,4 +1,4 @@
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: MCPRegistry
 metadata:
   name: my-mcpregistry
diff --git a/static/api-specs/crds/mcpregistries.schema.json b/static/api-specs/crds/mcpregistries.schema.json
index ff151c13..89915cf4 100644
--- a/static/api-specs/crds/mcpregistries.schema.json
+++ b/static/api-specs/crds/mcpregistries.schema.json
@@ -4,7 +4,7 @@
   "description": "MCPRegistry is the Schema for the mcpregistries API",
   "x-kubernetes-group": "toolhive.stacklok.dev",
   "x-kubernetes-kind": "MCPRegistry",
-  "x-kubernetes-version": "v1alpha1",
+  "x-kubernetes-version": "v1beta1",
   "x-kubernetes-plural": "mcpregistries",
   "x-kubernetes-short-names": [
     "mcpreg",
diff --git a/static/api-specs/crds/mcpremoteproxies.example.yaml b/static/api-specs/crds/mcpremoteproxies.example.yaml
index f4ec6f8a..4e06a587 100644
--- a/static/api-specs/crds/mcpremoteproxies.example.yaml
+++ b/static/api-specs/crds/mcpremoteproxies.example.yaml
@@ -1,4 +1,4 @@
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: MCPRemoteProxy
 metadata:
   name: my-mcpremoteproxy
diff --git a/static/api-specs/crds/mcpremoteproxies.schema.json b/static/api-specs/crds/mcpremoteproxies.schema.json
index 20424e68..a5587643 100644
--- a/static/api-specs/crds/mcpremoteproxies.schema.json
+++ b/static/api-specs/crds/mcpremoteproxies.schema.json
@@ -4,7 +4,7 @@
   "description": "MCPRemoteProxy is the Schema for the mcpremoteproxies API\nIt enables proxying remote MCP servers with authentication, authorization, audit logging, and tool filtering",
   "x-kubernetes-group": "toolhive.stacklok.dev",
   "x-kubernetes-kind": "MCPRemoteProxy",
-  "x-kubernetes-version": "v1alpha1",
+  "x-kubernetes-version": "v1beta1",
   "x-kubernetes-plural": "mcpremoteproxies",
   "x-kubernetes-short-names": [
     "rp",
diff --git a/static/api-specs/crds/mcpserverentries.example.yaml b/static/api-specs/crds/mcpserverentries.example.yaml
index 2a7384f3..cdc8eb58 100644
--- a/static/api-specs/crds/mcpserverentries.example.yaml
+++ b/static/api-specs/crds/mcpserverentries.example.yaml
@@ -1,4 +1,4 @@
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: MCPServerEntry
 metadata:
   name: my-mcpserverentry
diff --git a/static/api-specs/crds/mcpserverentries.schema.json b/static/api-specs/crds/mcpserverentries.schema.json
index 8acc33ba..ed37c587 100644
--- a/static/api-specs/crds/mcpserverentries.schema.json
+++ b/static/api-specs/crds/mcpserverentries.schema.json
@@ -4,7 +4,7 @@
   "description": "MCPServerEntry is the Schema for the mcpserverentries API.\nIt declares a remote MCP server endpoint for vMCP discovery and routing\nwithout deploying any infrastructure.",
   "x-kubernetes-group": "toolhive.stacklok.dev",
   "x-kubernetes-kind": "MCPServerEntry",
-  "x-kubernetes-version": "v1alpha1",
+  "x-kubernetes-version": "v1beta1",
   "x-kubernetes-plural": "mcpserverentries",
   "x-kubernetes-short-names": [
     "mcpentry"
diff --git a/static/api-specs/crds/mcpservers.example.yaml b/static/api-specs/crds/mcpservers.example.yaml
index b02c28a8..470f1903 100644
--- a/static/api-specs/crds/mcpservers.example.yaml
+++ b/static/api-specs/crds/mcpservers.example.yaml
@@ -1,4 +1,4 @@
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: MCPServer
 metadata:
   name: my-mcpserver
diff --git a/static/api-specs/crds/mcpservers.schema.json b/static/api-specs/crds/mcpservers.schema.json
index 148bceb6..395fb731 100644
--- a/static/api-specs/crds/mcpservers.schema.json
+++ b/static/api-specs/crds/mcpservers.schema.json
@@ -4,7 +4,7 @@
   "description": "MCPServer is the Schema for the mcpservers API",
   "x-kubernetes-group": "toolhive.stacklok.dev",
   "x-kubernetes-kind": "MCPServer",
-  "x-kubernetes-version": "v1alpha1",
+  "x-kubernetes-version": "v1beta1",
   "x-kubernetes-plural": "mcpservers",
   "x-kubernetes-short-names": [
     "mcpserver",
diff --git a/static/api-specs/crds/mcptelemetryconfigs.example.yaml b/static/api-specs/crds/mcptelemetryconfigs.example.yaml
index e630b142..d1a26f4a 100644
--- a/static/api-specs/crds/mcptelemetryconfigs.example.yaml
+++ b/static/api-specs/crds/mcptelemetryconfigs.example.yaml
@@ -1,4 +1,4 @@
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: MCPTelemetryConfig
 metadata:
   name: my-mcptelemetryconfig
diff --git a/static/api-specs/crds/mcptelemetryconfigs.schema.json b/static/api-specs/crds/mcptelemetryconfigs.schema.json
index 4aecc789..4f299679 100644
--- a/static/api-specs/crds/mcptelemetryconfigs.schema.json
+++ b/static/api-specs/crds/mcptelemetryconfigs.schema.json
@@ -4,7 +4,7 @@
   "description": "MCPTelemetryConfig is the Schema for the mcptelemetryconfigs API.\nMCPTelemetryConfig resources are namespace-scoped and can only be referenced by\nMCPServer resources within the same namespace. Cross-namespace references\nare not supported for security and isolation reasons.",
   "x-kubernetes-group": "toolhive.stacklok.dev",
   "x-kubernetes-kind": "MCPTelemetryConfig",
-  "x-kubernetes-version": "v1alpha1",
+  "x-kubernetes-version": "v1beta1",
   "x-kubernetes-plural": "mcptelemetryconfigs",
   "x-kubernetes-short-names": [
     "mcpotel"
diff --git a/static/api-specs/crds/mcptoolconfigs.example.yaml b/static/api-specs/crds/mcptoolconfigs.example.yaml
index 9b8de9ca..d911f3a6 100644
--- a/static/api-specs/crds/mcptoolconfigs.example.yaml
+++ b/static/api-specs/crds/mcptoolconfigs.example.yaml
@@ -1,4 +1,4 @@
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: MCPToolConfig
 metadata:
   name: my-mcptoolconfig
diff --git a/static/api-specs/crds/mcptoolconfigs.schema.json b/static/api-specs/crds/mcptoolconfigs.schema.json
index fbe41e6b..9efb42fc 100644
--- a/static/api-specs/crds/mcptoolconfigs.schema.json
+++ b/static/api-specs/crds/mcptoolconfigs.schema.json
@@ -4,7 +4,7 @@
   "description": "MCPToolConfig is the Schema for the mcptoolconfigs API.\nMCPToolConfig resources are namespace-scoped and can only be referenced by\nMCPServer resources within the same namespace. Cross-namespace references\nare not supported for security and isolation reasons.",
   "x-kubernetes-group": "toolhive.stacklok.dev",
   "x-kubernetes-kind": "MCPToolConfig",
-  "x-kubernetes-version": "v1alpha1",
+  "x-kubernetes-version": "v1beta1",
   "x-kubernetes-plural": "mcptoolconfigs",
   "x-kubernetes-short-names": [
     "tc",
diff --git a/static/api-specs/crds/virtualmcpcompositetooldefinitions.example.yaml b/static/api-specs/crds/virtualmcpcompositetooldefinitions.example.yaml
index e588ae95..cfae92d1 100644
--- a/static/api-specs/crds/virtualmcpcompositetooldefinitions.example.yaml
+++ b/static/api-specs/crds/virtualmcpcompositetooldefinitions.example.yaml
@@ -1,4 +1,4 @@
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: VirtualMCPCompositeToolDefinition
 metadata:
   name: my-virtualmcpcompositetooldefinition
diff --git a/static/api-specs/crds/virtualmcpcompositetooldefinitions.schema.json b/static/api-specs/crds/virtualmcpcompositetooldefinitions.schema.json
index c878929c..c2320024 100644
--- a/static/api-specs/crds/virtualmcpcompositetooldefinitions.schema.json
+++ b/static/api-specs/crds/virtualmcpcompositetooldefinitions.schema.json
@@ -4,7 +4,7 @@
   "description": "VirtualMCPCompositeToolDefinition is the Schema for the virtualmcpcompositetooldefinitions API\nVirtualMCPCompositeToolDefinition defines reusable composite workflows that can be referenced\nby multiple VirtualMCPServer instances",
   "x-kubernetes-group": "toolhive.stacklok.dev",
   "x-kubernetes-kind": "VirtualMCPCompositeToolDefinition",
-  "x-kubernetes-version": "v1alpha1",
+  "x-kubernetes-version": "v1beta1",
   "x-kubernetes-plural": "virtualmcpcompositetooldefinitions",
   "x-kubernetes-short-names": [
     "vmcpctd",
diff --git a/static/api-specs/crds/virtualmcpservers.example.yaml b/static/api-specs/crds/virtualmcpservers.example.yaml
index 664a53df..20167256 100644
--- a/static/api-specs/crds/virtualmcpservers.example.yaml
+++ b/static/api-specs/crds/virtualmcpservers.example.yaml
@@ -1,4 +1,4 @@
-apiVersion: toolhive.stacklok.dev/v1alpha1
+apiVersion: toolhive.stacklok.dev/v1beta1
 kind: VirtualMCPServer
 metadata:
   name: my-virtualmcpserver
diff --git a/static/api-specs/crds/virtualmcpservers.schema.json b/static/api-specs/crds/virtualmcpservers.schema.json
index 03f5db70..d380fbd3 100644
--- a/static/api-specs/crds/virtualmcpservers.schema.json
+++ b/static/api-specs/crds/virtualmcpservers.schema.json
@@ -4,7 +4,7 @@
   "description": "VirtualMCPServer is the Schema for the virtualmcpservers API\nVirtualMCPServer aggregates multiple backend MCPServers into a unified endpoint",
   "x-kubernetes-group": "toolhive.stacklok.dev",
   "x-kubernetes-kind": "VirtualMCPServer",
-  "x-kubernetes-version": "v1alpha1",
+  "x-kubernetes-version": "v1beta1",
   "x-kubernetes-plural": "virtualmcpservers",
   "x-kubernetes-short-names": [
     "vmcp",
diff --git a/static/api-specs/toolhive-api.yaml b/static/api-specs/toolhive-api.yaml
index 5fc9d245..e6c07a3e 100644
--- a/static/api-specs/toolhive-api.yaml
+++ b/static/api-specs/toolhive-api.yaml
@@ -31,7 +31,7 @@ components:
           description: Version is the schema version of the registry
           type: string
       type: object
-    github_com_stacklok_toolhive_cmd_thv-operator_api_v1alpha1.RateLimitBucket:
+    github_com_stacklok_toolhive_cmd_thv-operator_api_v1beta1.RateLimitBucket:
       description: |-
         PerUser token bucket configuration for this tool.
         +optional
@@ -47,15 +47,15 @@ components:
         refillPeriod:
           $ref: '#/components/schemas/v1.Duration'
       type: object
-    github_com_stacklok_toolhive_cmd_thv-operator_api_v1alpha1.RateLimitConfig:
+    github_com_stacklok_toolhive_cmd_thv-operator_api_v1beta1.RateLimitConfig:
       description: |-
         RateLimitConfig contains the CRD rate limiting configuration.
         When set, rate limiting middleware is added to the proxy middleware chain.
       properties:
         perUser:
-          $ref: '#/components/schemas/github_com_stacklok_toolhive_cmd_thv-operator_api_v1alpha1.RateLimitBucket'
+          $ref: '#/components/schemas/github_com_stacklok_toolhive_cmd_thv-operator_api_v1beta1.RateLimitBucket'
         shared:
-          $ref: '#/components/schemas/github_com_stacklok_toolhive_cmd_thv-operator_api_v1alpha1.RateLimitBucket'
+          $ref: '#/components/schemas/github_com_stacklok_toolhive_cmd_thv-operator_api_v1beta1.RateLimitBucket'
         tools:
           description: |-
             Tools defines per-tool rate limit overrides.
@@ -65,11 +65,11 @@ components:
             +listMapKey=name
             +optional
           items:
-            $ref: '#/components/schemas/github_com_stacklok_toolhive_cmd_thv-operator_api_v1alpha1.ToolRateLimitConfig'
+            $ref: '#/components/schemas/github_com_stacklok_toolhive_cmd_thv-operator_api_v1beta1.ToolRateLimitConfig'
           type: array
           uniqueItems: false
       type: object
-    github_com_stacklok_toolhive_cmd_thv-operator_api_v1alpha1.ToolRateLimitConfig:
+    github_com_stacklok_toolhive_cmd_thv-operator_api_v1beta1.ToolRateLimitConfig:
       properties:
         name:
           description: |-
@@ -78,9 +78,9 @@ components:
             +kubebuilder:validation:MinLength=1
           type: string
         perUser:
-          $ref: '#/components/schemas/github_com_stacklok_toolhive_cmd_thv-operator_api_v1alpha1.RateLimitBucket'
+          $ref: '#/components/schemas/github_com_stacklok_toolhive_cmd_thv-operator_api_v1beta1.RateLimitBucket'
         shared:
-          $ref: '#/components/schemas/github_com_stacklok_toolhive_cmd_thv-operator_api_v1alpha1.RateLimitBucket'
+          $ref: '#/components/schemas/github_com_stacklok_toolhive_cmd_thv-operator_api_v1beta1.RateLimitBucket'
       type: object
     github_com_stacklok_toolhive_pkg_audit.Config:
       description: |-
@@ -1213,7 +1213,7 @@ components:
           type: array
           uniqueItems: false
         rate_limit_config:
-          $ref: '#/components/schemas/github_com_stacklok_toolhive_cmd_thv-operator_api_v1alpha1.RateLimitConfig'
+          $ref: '#/components/schemas/github_com_stacklok_toolhive_cmd_thv-operator_api_v1beta1.RateLimitConfig'
         rate_limit_namespace:
           description: RateLimitNamespace is the Kubernetes namespace for Redis key
             derivation.