diff --git a/modules/ai-app-mcp-server-configure-gateway.adoc b/modules/ai-app-mcp-server-configure-gateway.adoc
index 760c79b16d02..1144e1a68946 100644
--- a/modules/ai-app-mcp-server-configure-gateway.adoc
+++ b/modules/ai-app-mcp-server-configure-gateway.adoc
@@ -33,7 +33,7 @@ spec:
   - group: gateway.networking.k8s.io
     kind: Gateway
     name: mcp-gateway
-    namespace: gateway-system
+    namespace: gateway-namespace
     sectionName: mcp
   hostnames:
   - ${MCP_SERVER_HOST}
@@ -63,7 +63,7 @@ metadata:
   name: my-mcp-server-reg
   namespace: openshift-mcp-server
 spec:
-  toolPrefix: "openshift_"
+  prefix: "openshift_"
   targetRef:
     group: "gateway.networking.k8s.io"
     kind: "HTTPRoute"
@@ -108,14 +108,14 @@ $ oc describe mcpsr my-mcp-server-reg -n openshift-mcp-server
 +
 [source,terminal]
 ----
-$ oc logs -n mcp-system deployment/mcp-gateway-controller
+$ oc logs -n gateway-namespace deployment/mcp-gateway-controller
 ----
 
 . Check the broker logs for tool discovery by running the following command:
 +
 [source,terminal]
 ----
-$ oc logs -n mcp-system deployment/mcp-gateway-broker-router
+$ oc logs -n gateway-namespace deployment/mcp-gateway
 ----
 
 . Verify that your MCP server tools are available through the MCP gateway:
diff --git a/modules/ai-app-mcp-server-install-helm.adoc b/modules/ai-app-mcp-server-install-helm.adoc
index a8f3ed62f392..ea61267b936b 100644
--- a/modules/ai-app-mcp-server-install-helm.adoc
+++ b/modules/ai-app-mcp-server-install-helm.adoc
@@ -12,9 +12,34 @@ To install the Model Context Protocol (MCP) server for Red Hat {product-title} f
 .Prerequisites
 
 * Access to OpenShift console with admin rights.
+* Helm CLI is installed.
+* {oc-first} is installed.
 
 .Procedure
 
+. Add the Red Hat OpenShift Helm chart repository to you local client by entering the following command:
++
+[source,terminal]
+----
+$ helm repo add openshift-helm-charts https://charts.openshift.io/
+----
++
+A confirmation message indicates that the repository `openshift-helm-charts` has been successfully added to the client.
+
+. Update your local Helm chart registry to retrieve the latest version information and metadata for the MCP server chart:
++
+[source,terminal]
+----
+$ helm repo update
+----
++
+The following output indicates a successful update of the `openshift-helm-charts` repository:
++
+[source,terminal]
+----
+Successfully got an update from the "openshift-helm-charts" repository
+----
+
 . Install the MCP server for Red Hat {product-title} Helm chart by running one of the following commands:
 +
 * For read-only access (recommended for most use cases):
diff --git a/modules/ai-app-mcp-server-setup-authentication.adoc b/modules/ai-app-mcp-server-setup-authentication.adoc
index ad26eb1e9e52..dd01a382c999 100644
--- a/modules/ai-app-mcp-server-setup-authentication.adoc
+++ b/modules/ai-app-mcp-server-setup-authentication.adoc
@@ -44,13 +44,13 @@ apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
   name: mcp-gateway-oauth-metadata
-  namespace: mcp-system
+  namespace: gateway-namespace
 spec:
   parentRefs:
   - group: gateway.networking.k8s.io
     kind: Gateway
     name: mcp-gateway
-    namespace: gateway-system
+    namespace: gateway-namespace
     sectionName: mcp
   hostnames:
   - ${MCP_GATEWAY_HOST}
@@ -115,7 +115,7 @@ apiVersion: kuadrant.io/v1
 kind: AuthPolicy
 metadata:
   name: mcp-auth-policy
-  namespace: mcp-system
+  namespace: gateway-namespace
 spec:
   targetRef:
     group: gateway.networking.k8s.io
diff --git a/modules/ai-app-mcp-server-verify-deployment.adoc b/modules/ai-app-mcp-server-verify-deployment.adoc
index ee414339bf48..b12272513117 100644
--- a/modules/ai-app-mcp-server-verify-deployment.adoc
+++ b/modules/ai-app-mcp-server-verify-deployment.adoc
@@ -11,7 +11,8 @@ To install the Model Context Protocol (MCP) server for Red Hat {product-title} f
 
 .Prerequisites
 
-* Access to OpenShift console with admin rights.
+* Access to {product-title} console with admin rights.
+
 * The MCP server Helm chart is installed.
 * MCP-compatible client connected.
 * MCP gateway is installed.
@@ -22,12 +23,12 @@ To install the Model Context Protocol (MCP) server for Red Hat {product-title} f
 +
 [source,terminal]
 ----
-$ oc get pods -n mcp-system -l "app.kubernetes.io/instance=mcp-gateway"
+$ oc get pods -n gateway-namespace -l "app.kubernetes.io/name=mcp-gateway"
 ----
 +
 [NOTE]
 ====
-This example uses the namespace "mcp-system" for installing the gateway. If you install the gateway in a different namespace than "mcp-system", use that namespace instead throughout the procedure.
+This example uses the namespace "gateway-namespace" for installing the gateway. If you install the gateway in a different namespace than "gateway-namespace", use that namespace instead throughout the procedure.
 ====
 +
 .Example
@@ -48,15 +49,15 @@ $ oc get mcpgatewayextension -A
 +
 [source,terminal]
 ----
-NAMESPACE   NAME          READY   AGE
-mcp-system  mcp-gateway           105s
+NAMESPACE          NAME          READY   AGE
+gateway-namespace  mcp-gateway           105s
 ----
 
 . Verify the broker-router deployment by running the following command:
 +
 [source,terminal]
 ----
-$ oc logs -n mcp-system deployment/mcp-gateway-broker-router
+$ oc logs -n gateway-namespace deployment/mcp-gateway
 ----
 
 . Verify EnvoyFilter was created in the gateway namespace by running the following command: