diff --git a/chart/Chart.lock b/chart/Chart.lock
index e7d58051..d56f9efc 100644
--- a/chart/Chart.lock
+++ b/chart/Chart.lock
@@ -13,6 +13,6 @@ dependencies:
   version: v1.4.0
 - name: ai-gateway-helm
   repository: oci://registry-1.docker.io/envoyproxy
-  version: v0.1.5
-digest: sha256:d4ca67d95b86b66af01991f1a2eab307db36ebd9a627f06581c0292e10cad259
-generated: "2025-06-17T11:08:57.411227+08:00"
+  version: v0.2.1
+digest: sha256:4570f7225628789c1485224dfedac251373ce77c1b28abaae9fc8721043fff0a
+generated: "2025-07-05T09:46:42.466286422+08:00"
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index b4288b52..78705a18 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -38,6 +38,10 @@ dependencies:
     repository: "oci://registry-1.docker.io/envoyproxy"
     condition: envoy-gateway.enabled
   - name: ai-gateway-helm
-    version: v0.1.5
+    version: v0.2.1
+    repository: "oci://registry-1.docker.io/envoyproxy"
+    condition: envoy-ai-gateway.enabled
+  - name: ai-gateway-crds-helm
+    version: v0.2.1
     repository: "oci://registry-1.docker.io/envoyproxy"
     condition: envoy-ai-gateway.enabled
diff --git a/docs/examples/envoy-ai-gateway/basic-vllm.yaml b/docs/examples/envoy-ai-gateway/basic-vllm.yaml
index e6e051d9..d8f4828b 100644
--- a/docs/examples/envoy-ai-gateway/basic-vllm.yaml
+++ b/docs/examples/envoy-ai-gateway/basic-vllm.yaml
@@ -62,18 +62,29 @@ spec:
               value: qwen3-0--6b
       backendRefs:
         - name: qwen3-0--6b
+      modelsOwnedBy: "llmaz"
+      timeouts:
+        request: 3m
 ---
 apiVersion: aigateway.envoyproxy.io/v1alpha1
 kind: AIServiceBackend
 metadata:
   name: qwen3-0--6b
 spec:
-  timeouts:
-    request: 3m
   schema:
     name: OpenAI
   backendRef:
-    name: qwen3-0--6b-lb
-    kind: Service
-    port: 8080
+    name: qwen3-0--6b
+    kind: Backend
+    group: gateway.envoyproxy.io
 ---
+apiVersion: gateway.envoyproxy.io/v1alpha1
+kind: Backend
+metadata:
+  name: qwen3-0--6b
+  namespace: default
+spec:
+  endpoints:
+    - fqdn:
+        hostname: qwen3-0--6b-lb.default.svc.cluster.local
+        port: 8080
diff --git a/docs/examples/envoy-ai-gateway/basic.yaml b/docs/examples/envoy-ai-gateway/basic.yaml
index 0f203e96..0fbb4e4d 100644
--- a/docs/examples/envoy-ai-gateway/basic.yaml
+++ b/docs/examples/envoy-ai-gateway/basic.yaml
@@ -85,6 +85,9 @@ spec:
               value: qwen2-0--5b
       backendRefs:
         - name: qwen2-0--5b
+      modelsOwnedBy: "llmaz"
+      timeouts:
+        request: 3m
     - matches:
         - headers:
             - type: Exact
@@ -92,31 +95,52 @@ spec:
               value: qwen2--5-coder
       backendRefs:
         - name: qwen2--5-coder
+      modelsOwnedBy: "llmaz"
+      timeouts:
+        request: 3m
 ---
 apiVersion: aigateway.envoyproxy.io/v1alpha1
 kind: AIServiceBackend
 metadata:
   name: qwen2-0--5b
 spec:
-  timeouts:
-    request: 3m
   schema:
     name: OpenAI
   backendRef:
-    name: qwen2-0--5b-lb
-    kind: Service
-    port: 8080
+    name: qwen2-0--5b
+    kind: Backend
+    group: gateway.envoyproxy.io
 ---
 apiVersion: aigateway.envoyproxy.io/v1alpha1
 kind: AIServiceBackend
 metadata:
   name: qwen2--5-coder
 spec:
-  timeouts:
-    request: 3m
   schema:
     name: OpenAI
   backendRef:
-    name: qwen2--5-coder-lb
-    kind: Service
-    port: 8080
+    name: qwen2--5-coder
+    kind: Backend
+    group: gateway.envoyproxy.io
+---
+apiVersion: gateway.envoyproxy.io/v1alpha1
+kind: Backend
+metadata:
+  name: qwen2-0--5b
+  namespace: default
+spec:
+  endpoints:
+    - fqdn:
+        hostname: qwen2-0--5b-lb.default.svc.cluster.local
+        port: 8080
+---
+apiVersion: gateway.envoyproxy.io/v1alpha1
+kind: Backend
+metadata:
+  name: qwen2--5-coder
+  namespace: default
+spec:
+  endpoints:
+    - fqdn:
+        hostname: qwen2--5-coder-lb.default.svc.cluster.local
+        port: 8080