From a7ac24de9d33b10e27eb31f5568a2a7e68c729ab Mon Sep 17 00:00:00 2001
From: Naduni Pamudika <nadunipamudika@naduni.local>
Date: Thu, 30 Jul 2026 13:40:14 +0530
Subject: [PATCH 1/5] Improve docs for the release

---
 .../llm-provider-template-management.md       | 38 +++++++++++++------
 .../ai-workspace/configure-inbound-auth.md    | 26 ++++---------
 .../llm-providers/configure-provider.md       |  2 +-
 .../llm-providers/manage-provider.md          | 36 ++++++++----------
 .../llm-providers/configure-provider.md       |  2 +-
 .../llm-providers/manage-provider.md          | 36 ++++++++----------
 6 files changed, 67 insertions(+), 73 deletions(-)

diff --git a/en/docs/api-gateway/next/gateway-controller-management-api/llm-provider-template-management.md b/en/docs/api-gateway/next/gateway-controller-management-api/llm-provider-template-management.md
index d1e885703..0042a2793 100644
--- a/en/docs/api-gateway/next/gateway-controller-management-api/llm-provider-template-management.md
+++ b/en/docs/api-gateway/next/gateway-controller-management-api/llm-provider-template-management.md
@@ -26,7 +26,7 @@ CRUD operations for LLM Provider Template configurations
 
 ```shell
 
-curl -X POST http://localhost:9090/api/management/v0.9/llm-provider-templates \
+curl -X POST http://localhost:9090/api/management/v1/llm-provider-templates \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -40,7 +40,7 @@ Add a new LLM provider template to the Gateway. A template defines token trackin
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "LlmProviderTemplate",
   "metadata": {
     "name": "openai-template"
@@ -75,6 +75,20 @@ Add a new LLM provider template to the Gateway. A template defines token trackin
 }
 ```
 
+!!! note "Using a YAML downloaded from AI Workspace"
+    If you downloaded the template YAML from AI Workspace, you have two options to use it with this endpoint:
+
+    - **Convert to JSON:** Convert the YAML file to JSON before passing it as the request body with `-H 'Content-Type: application/json'`.
+    - **Send as YAML:** Pass the YAML file directly and change the content type header to `application/yaml`:
+
+    ```shell
+    curl -X POST http://localhost:9090/api/management/v1/llm-provider-templates \
+      -u {username}:{password} \
+      -H 'Content-Type: application/yaml' \
+      -H 'Accept: application/json' \
+      --data-binary @template.yaml
+    ```
+
 ### Authentication
 
 <aside class="warning">
@@ -96,7 +110,7 @@ Required roles: `admin`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "LlmProviderTemplate",
   "metadata": {
     "name": "openai-template"
@@ -155,7 +169,7 @@ Required roles: `admin`
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/llm-provider-templates \
+curl -X GET http://localhost:9090/api/management/v1/llm-provider-templates \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -188,7 +202,7 @@ Required roles: `admin`
   "count": 3,
   "templates": [
     {
-      "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+      "apiVersion": "gateway.api-platform.wso2.com/v1",
       "kind": "LlmProviderTemplate",
       "metadata": {
         "name": "openai-template"
@@ -296,7 +310,7 @@ Status Code **200**
 
 |Property|Value|
 |---|---|
-|apiVersion|gateway.api-platform.wso2.com/v1alpha1|
+|apiVersion|gateway.api-platform.wso2.com/v1|
 |kind|LlmProviderTemplate|
 |location|payload|
 |location|header|
@@ -315,7 +329,7 @@ Status Code **200**
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/llm-provider-templates/{id} \
+curl -X GET http://localhost:9090/api/management/v1/llm-provider-templates/{id} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -344,7 +358,7 @@ Required roles: `admin`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "LlmProviderTemplate",
   "metadata": {
     "name": "openai-template"
@@ -402,7 +416,7 @@ Required roles: `admin`
 
 ```shell
 
-curl -X PUT http://localhost:9090/api/management/v0.9/llm-provider-templates/{id} \
+curl -X PUT http://localhost:9090/api/management/v1/llm-provider-templates/{id} \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -416,7 +430,7 @@ Update an existing LLM provider template in the Gateway.
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "LlmProviderTemplate",
   "metadata": {
     "name": "openai-template"
@@ -473,7 +487,7 @@ Required roles: `admin`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "LlmProviderTemplate",
   "metadata": {
     "name": "openai-template"
@@ -532,7 +546,7 @@ Required roles: `admin`
 
 ```shell
 
-curl -X DELETE http://localhost:9090/api/management/v0.9/llm-provider-templates/{id} \
+curl -X DELETE http://localhost:9090/api/management/v1/llm-provider-templates/{id} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
diff --git a/en/docs/cloud/ai-workspace/configure-inbound-auth.md b/en/docs/cloud/ai-workspace/configure-inbound-auth.md
index 69dd10324..5bec363e2 100644
--- a/en/docs/cloud/ai-workspace/configure-inbound-auth.md
+++ b/en/docs/cloud/ai-workspace/configure-inbound-auth.md
@@ -1,6 +1,6 @@
 ---
 title: "Configure inbound authentication"
-description: "Control where and under what name client applications send their API key when calling a deployed LLM provider or App LLM proxy."
+description: "Control the header name client applications use to send their API key when calling a deployed LLM provider or App LLM proxy."
 canonical_url: https://wso2.com/api-platform/docs/cloud/ai-workspace/configure-inbound-auth/
 md_url: https://wso2.com/api-platform/docs/cloud/ai-workspace/configure-inbound-auth.md
 tags:
@@ -18,17 +18,16 @@ The **Security** tab on both LLM Providers and App LLM Proxies controls how clie
 
 ## How It Works
 
-When a provider or proxy is deployed, the gateway enforces inbound authentication on every incoming request. Clients must include a valid API key in the location and under the name you configure in the Security tab.
+When a provider or proxy is deployed, the gateway enforces inbound authentication on every incoming request. Clients must include a valid API key in the request header, under the name you configure in the Security tab.
 
-The API key itself is generated by the AI Workspace (shown once at creation, valid for 90 days). The Security tab controls **where** and **under what name** the client must send it.
+The API key itself is generated by the AI Workspace (shown once at creation, valid for 90 days). The Security tab controls **which header name** the client must use to send it.
 
 ## Security Tab Fields
 
 | Field | Description |
 |-------|-------------|
 | **Authentication** | Authentication type. Currently `apiKey` is the only supported option. |
-| **API Key** / **Key name** | The name of the header or query parameter that must carry the API key. Defaults to `X-API-Key`. |
-| **Key Location** / **Sent in** | Whether the key is expected in a request `header` or as a `query` parameter. Defaults to `header`. |
+| **API Key** / **Key name** | The name of the request header that must carry the API key. Defaults to `X-API-Key`. |
 
 ## Default Behaviour: X-API-Key Header
 
@@ -53,20 +52,9 @@ SDKs such as the OpenAI SDK, Mistral SDK, and Azure OpenAI SDK all send an `Auth
 !!! note
     The gateway validates the key value regardless of prefix — it strips a leading `Bearer ` before comparing against the stored key.
 
-## Sending the Key as a Query Parameter
-
-If you set **Key Location** to `query`, clients append the key to the request URL instead:
-
-```
-https://<gateway-host>/<context>?<key-name>=<your-api-key>
-```
-
-This is useful in environments where setting custom request headers is not straightforward.
-
 ## Steps to Configure
 
 1. Open your LLM Provider or App LLM Proxy and go to the **Security** tab.
-2. Set the **API Key** / **Key name** field to the header or query parameter name your application will use.
-3. Set **Key Location** / **Sent in** to `header` or `query` as appropriate.
-4. Click **Save**.
-5. **Deploy to Gateway** — security changes take effect only after redeployment.
+2. Set the **API Key** / **Key name** field to the header name your application will use.
+3. Click **Save**.
+4. **Deploy to Gateway** — security changes take effect only after redeployment.
diff --git a/en/docs/cloud/ai-workspace/llm-providers/configure-provider.md b/en/docs/cloud/ai-workspace/llm-providers/configure-provider.md
index 1c26c04a9..aff11c31f 100644
--- a/en/docs/cloud/ai-workspace/llm-providers/configure-provider.md
+++ b/en/docs/cloud/ai-workspace/llm-providers/configure-provider.md
@@ -28,7 +28,7 @@ LLM Providers allow you to connect AI service platforms like OpenAI, Anthropic,
 ## Add a New Provider
 
 1. Navigate to **AI Workspace** in your API Platform dashboard.
-2. Select **Service Providers** from the menu.
+2. Select **LLM Providers** from the menu.
 3. Click **+ Add New Provider** and choose your provider type (e.g., **OpenAI**, **Anthropic**).
 
    ![Add LLM Service Provider panel showing selectable tiles for OpenAI, Mistral, Gemini, Azure OpenAI, Azure AI Foundry, AWS Bedrock, and Anthropic](../../../assets/img/ai-gateway/ai-workspace/llm-provider/select-llm-provider-type.png)
diff --git a/en/docs/cloud/ai-workspace/llm-providers/manage-provider.md b/en/docs/cloud/ai-workspace/llm-providers/manage-provider.md
index bb1462380..7822bab4a 100644
--- a/en/docs/cloud/ai-workspace/llm-providers/manage-provider.md
+++ b/en/docs/cloud/ai-workspace/llm-providers/manage-provider.md
@@ -132,17 +132,13 @@ Set up the API key that client applications must provide:
 | Field | Description | Example |
 |-------|-------------|---------|
 | **Authentication Type** | Authentication method | `apiKey` (default) |
-| **API Key Name** | Header or query parameter name | `x-api-key`, `apikey`, `Authorization` |
-| **Key Location** | Where clients send the key | `Header` (recommended) or `Query` |
+| **API Key Name** | Name of the request header that must carry the API key | `x-api-key`, `apikey`, `Authorization` |
 
 **To configure:**
 
-1. Select **Authentication Type**: `apiKey`
-2. Enter **API Key Name** that applications will use
-3. Choose **Key Location**:
-    - **Header** - Sent in HTTP request header (most secure)
-    - **Query** - Sent as URL query parameter (less secure)
-4. Click **Save**
+1. Select **Authentication Type**: `apiKey`.
+2. Enter the **API Key Name** header that applications will use.
+3. Click **Save**.
 
 ---
 
@@ -270,22 +266,22 @@ Configure which AI models are accessible through this provider.
 
 </div>
 
-### Add Models
+### Add and remove models
 
-**To add new models:**
+The **Models** tab displays a chip list of the models available through this provider. Each chip represents one model ID.
 
-1. Click **Add model provider**
-2. Select a provider from the list to import its model catalog
-3. Click **Add**
-4. The models are added and enabled by default
+**To add a model:**
 
-### Enable/Disable Models
+1. Type or paste the model ID into the input field and press <kbd>Enter</kbd>, or select it from the autocomplete list.
+2. The model chip appears in the list.
+3. Click **Save**, then **Deploy to Gateway** to apply the change.
 
-Control which models applications can access:
+**To remove a model:**
 
-- **Toggle switches**: Enable/disable individual models
-- **Effect**: Disabled models are blocked at the gateway
-- Applications attempting to use disabled models will receive an error
+1. Click the **×** on the model chip you want to remove.
+2. Click **Save**, then **Deploy to Gateway** to apply the change.
+
+Models not in the chip list are blocked at the gateway. Applications requesting a removed model receive an error.
 
 ---
 
@@ -301,7 +297,7 @@ Push configuration changes to deployed gateways.
 
 - After updating connection settings
 - After modifying rate limits or guardrails  
-- After enabling/disabling resources or models
+- After adding or removing models
 
 **To redeploy:**
 
diff --git a/en/docs/next/ai-workspace/llm-providers/configure-provider.md b/en/docs/next/ai-workspace/llm-providers/configure-provider.md
index a4e6c8a1d..47df7fd73 100644
--- a/en/docs/next/ai-workspace/llm-providers/configure-provider.md
+++ b/en/docs/next/ai-workspace/llm-providers/configure-provider.md
@@ -28,7 +28,7 @@ LLM Providers allow you to connect AI service platforms like OpenAI, Anthropic,
 ## Add a New Provider
 
 1. Navigate to **AI Workspace** in your API Platform dashboard.
-2. Select **Service Providers** from the menu.
+2. Select **LLM Providers** from the menu.
 3. Click **+ Add New Provider** and choose your provider type (e.g., **OpenAI**, **Anthropic**). Any [custom LLM provider templates](../llm-provider-templates/overview.md) you have created also appear in the picker.
 
    ![Add LLM Service Provider panel showing selectable tiles for OpenAI, Mistral, Gemini, Azure OpenAI, Azure AI Foundry, AWS Bedrock, and Anthropic](../../../assets/img/ai-gateway/standalone-ai-workspace/llm-provider/select-llm-provider-type.png)
diff --git a/en/docs/next/ai-workspace/llm-providers/manage-provider.md b/en/docs/next/ai-workspace/llm-providers/manage-provider.md
index a13cad3c5..bc543e0d9 100644
--- a/en/docs/next/ai-workspace/llm-providers/manage-provider.md
+++ b/en/docs/next/ai-workspace/llm-providers/manage-provider.md
@@ -142,19 +142,15 @@ Set up the API key that client applications must provide:
 | Field | Description | Example |
 |-------|-------------|---------|
 | **Authentication Type** | Authentication method | `apiKey` (default) |
-| **API Key** | Header or query parameter name | `x-api-key`, `apikey`, `Authorization` |
+| **API Key** | Name of the request header that must carry the API key | `x-api-key`, `apikey`, `Authorization` |
 | **API Key Value Prefix** | Optional prefix prepended to the value clients must send, e.g. so clients send `Bearer <key>` | `Bearer` |
-| **Key Location** | Where clients send the key | `Header` (recommended) or `Query` |
 
 **To configure:**
 
 1. Select **Authentication Type**: `apiKey`
-2. Enter the **API Key** header or query parameter name that applications will use
-3. Optionally set an **API Key Value Prefix** (for example `Bearer`) if clients should send the key with a scheme prefix
-4. Choose **Key Location**:
-    - **Header** - Sent in HTTP request header (most secure)
-    - **Query** - Sent as URL query parameter (less secure)
-5. Click **Save**
+2. Enter the **API Key** header name that applications will use.
+3. Optionally set an **API Key Value Prefix** (for example `Bearer`) if clients should send the key with a scheme prefix.
+4. Click **Save**.
 
 ---
 
@@ -287,22 +283,22 @@ Configure which AI models are accessible through this provider.
 
 </div>
 
-### Add Models
+### Add and remove models
+
+The **Models** tab displays a chip list of the models available through this provider. Each chip represents one model ID.
 
-**To add new models:**
+**To add a model:**
 
-1. Click **Add model provider**
-2. Select a provider from the list to import its model catalog
-3. Click **Add**
-4. The models are added and enabled by default
+1. Type or paste the model ID into the input field and press <kbd>Enter</kbd>, or select it from the autocomplete list.
+2. The model chip appears in the list.
+3. Click **Save**, then **Deploy to Gateway** to apply the change.
 
-### Enable/Disable Models
+**To remove a model:**
 
-Control which models applications can access:
+1. Click the **×** on the model chip you want to remove.
+2. Click **Save**, then **Deploy to Gateway** to apply the change.
 
-- **Toggle switches**: Enable/disable individual models
-- **Effect**: Disabled models are blocked at the gateway
-- Applications attempting to use disabled models will receive an error
+Models not in the chip list are blocked at the gateway. Applications requesting a removed model receive an error.
 
 ---
 
@@ -318,7 +314,7 @@ Push configuration changes to deployed gateways.
 
 - After updating connection settings
 - After modifying rate limits or guardrails  
-- After enabling/disabling resources or models
+- After adding or removing models
 
 **To redeploy:**
 

From 16a83f39238f66610d21ac0854bc8a4cb8682c1e Mon Sep 17 00:00:00 2001
From: Naduni Pamudika <nadunipamudika@naduni.local>
Date: Thu, 30 Jul 2026 14:58:08 +0530
Subject: [PATCH 2/5] Fix review comments

---
 .../certificate-management.md                 |  8 +--
 .../llm-provider-management.md                | 34 +++++-----
 .../llm-proxy-management.md                   | 34 +++++-----
 .../mcp-proxy-management.md                   | 24 +++----
 .../overview.md                               |  6 +-
 .../rest-api-management.md                    | 54 ++++++++--------
 .../schemas.md                                | 62 +++++++++----------
 .../secrets-management.md                     | 22 +++----
 .../webbroker-api-management.md               | 18 +++---
 .../websub-api-management.md                  | 34 +++++-----
 .../ai-workspace/configure-inbound-auth.md    |  1 +
 .../llm-providers/manage-provider.md          |  5 +-
 .../ai-workspace/llm-proxies/manage-proxy.md  |  8 +--
 .../ai-workspace/configure-inbound-auth.md    | 27 +++-----
 .../llm-providers/manage-provider.md          |  5 +-
 .../ai-workspace/llm-proxies/manage-proxy.md  |  8 +--
 16 files changed, 167 insertions(+), 183 deletions(-)

diff --git a/en/docs/api-gateway/next/gateway-controller-management-api/certificate-management.md b/en/docs/api-gateway/next/gateway-controller-management-api/certificate-management.md
index dbb426242..832b2c63d 100644
--- a/en/docs/api-gateway/next/gateway-controller-management-api/certificate-management.md
+++ b/en/docs/api-gateway/next/gateway-controller-management-api/certificate-management.md
@@ -27,7 +27,7 @@ Manage custom TLS certificates for HTTPS upstream verification
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/certificates \
+curl -X GET http://localhost:9090/api/management/v1/certificates \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -86,7 +86,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X POST http://localhost:9090/api/management/v0.9/certificates \
+curl -X POST http://localhost:9090/api/management/v1/certificates \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -155,7 +155,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X DELETE http://localhost:9090/api/management/v0.9/certificates/{id} \
+curl -X DELETE http://localhost:9090/api/management/v1/certificates/{id} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -218,7 +218,7 @@ Status Code **200**
 
 ```shell
 
-curl -X POST http://localhost:9090/api/management/v0.9/certificates/reload \
+curl -X POST http://localhost:9090/api/management/v1/certificates/reload \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
diff --git a/en/docs/api-gateway/next/gateway-controller-management-api/llm-provider-management.md b/en/docs/api-gateway/next/gateway-controller-management-api/llm-provider-management.md
index 7ff55a6ad..c5739b61b 100644
--- a/en/docs/api-gateway/next/gateway-controller-management-api/llm-provider-management.md
+++ b/en/docs/api-gateway/next/gateway-controller-management-api/llm-provider-management.md
@@ -26,7 +26,7 @@ CRUD operations for LLM Provider configurations
 
 ```shell
 
-curl -X POST http://localhost:9090/api/management/v0.9/llm-providers \
+curl -X POST http://localhost:9090/api/management/v1/llm-providers \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -40,7 +40,7 @@ Add a new LLM provider to the Gateway. A provider defines how to interact with a
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "LlmProvider",
   "metadata": {
     "name": "wso2-openai-provider"
@@ -106,7 +106,7 @@ Required roles: `admin`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "LlmProvider",
   "metadata": {
     "name": "wso2-openai-provider"
@@ -177,7 +177,7 @@ Required roles: `admin`
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/llm-providers \
+curl -X GET http://localhost:9090/api/management/v1/llm-providers \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -221,7 +221,7 @@ Required roles: `admin`, `developer`
   "count": 2,
   "providers": [
     {
-      "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+      "apiVersion": "gateway.api-platform.wso2.com/v1",
       "kind": "LlmProvider",
       "metadata": {
         "name": "wso2-openai-provider"
@@ -378,7 +378,7 @@ Status Code **200**
 
 |Property|Value|
 |---|---|
-|apiVersion|gateway.api-platform.wso2.com/v1alpha1|
+|apiVersion|gateway.api-platform.wso2.com/v1|
 |kind|LlmProvider|
 |hostRewrite|auto|
 |hostRewrite|manual|
@@ -400,7 +400,7 @@ Status Code **200**
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/llm-providers/{id} \
+curl -X GET http://localhost:9090/api/management/v1/llm-providers/{id} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -429,7 +429,7 @@ Required roles: `admin`, `developer`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "LlmProvider",
   "metadata": {
     "name": "wso2-openai-provider"
@@ -499,7 +499,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X PUT http://localhost:9090/api/management/v0.9/llm-providers/{id} \
+curl -X PUT http://localhost:9090/api/management/v1/llm-providers/{id} \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -513,7 +513,7 @@ Update an existing LLM provider in the Gateway.
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "LlmProvider",
   "metadata": {
     "name": "wso2-openai-provider"
@@ -580,7 +580,7 @@ Required roles: `admin`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "LlmProvider",
   "metadata": {
     "name": "wso2-openai-provider"
@@ -651,7 +651,7 @@ Required roles: `admin`
 
 ```shell
 
-curl -X DELETE http://localhost:9090/api/management/v0.9/llm-providers/{id} \
+curl -X DELETE http://localhost:9090/api/management/v1/llm-providers/{id} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -714,7 +714,7 @@ Status Code **200**
 
 ```shell
 
-curl -X POST http://localhost:9090/api/management/v0.9/llm-providers/{id}/api-keys \
+curl -X POST http://localhost:9090/api/management/v1/llm-providers/{id}/api-keys \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -791,7 +791,7 @@ Required roles: `admin`, `consumer`
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/llm-providers/{id}/api-keys \
+curl -X GET http://localhost:9090/api/management/v1/llm-providers/{id}/api-keys \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -856,7 +856,7 @@ Required roles: `admin`, `consumer`
 
 ```shell
 
-curl -X POST http://localhost:9090/api/management/v0.9/llm-providers/{id}/api-keys/{apiKeyName}/regenerate \
+curl -X POST http://localhost:9090/api/management/v1/llm-providers/{id}/api-keys/{apiKeyName}/regenerate \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -931,7 +931,7 @@ Required roles: `admin`, `consumer`
 
 ```shell
 
-curl -X PUT http://localhost:9090/api/management/v0.9/llm-providers/{id}/api-keys/{apiKeyName} \
+curl -X PUT http://localhost:9090/api/management/v1/llm-providers/{id}/api-keys/{apiKeyName} \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -1009,7 +1009,7 @@ Required roles: `admin`, `consumer`
 
 ```shell
 
-curl -X DELETE http://localhost:9090/api/management/v0.9/llm-providers/{id}/api-keys/{apiKeyName} \
+curl -X DELETE http://localhost:9090/api/management/v1/llm-providers/{id}/api-keys/{apiKeyName} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
diff --git a/en/docs/api-gateway/next/gateway-controller-management-api/llm-proxy-management.md b/en/docs/api-gateway/next/gateway-controller-management-api/llm-proxy-management.md
index bfbf482b8..9a980a985 100644
--- a/en/docs/api-gateway/next/gateway-controller-management-api/llm-proxy-management.md
+++ b/en/docs/api-gateway/next/gateway-controller-management-api/llm-proxy-management.md
@@ -26,7 +26,7 @@ CRUD operations for LLM Proxy configurations
 
 ```shell
 
-curl -X POST http://localhost:9090/api/management/v0.9/llm-proxies \
+curl -X POST http://localhost:9090/api/management/v1/llm-proxies \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -40,7 +40,7 @@ Add a new LLM proxy to the Gateway. A proxy defines how to interact with an LLM
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "LlmProxy",
   "metadata": {
     "name": "openai-proxy"
@@ -78,7 +78,7 @@ Required roles: `admin`, `developer`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "LlmProxy",
   "metadata": {
     "name": "openai-proxy"
@@ -121,7 +121,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/llm-proxies \
+curl -X GET http://localhost:9090/api/management/v1/llm-proxies \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -165,7 +165,7 @@ Required roles: `admin`, `developer`
   "count": 2,
   "proxies": [
     {
-      "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+      "apiVersion": "gateway.api-platform.wso2.com/v1",
       "kind": "LlmProxy",
       "metadata": {
         "name": "openai-proxy"
@@ -257,7 +257,7 @@ Status Code **200**
 
 |Property|Value|
 |---|---|
-|apiVersion|gateway.api-platform.wso2.com/v1alpha1|
+|apiVersion|gateway.api-platform.wso2.com/v1|
 |kind|LlmProxy|
 |type|api-key|
 |deploymentState|deployed|
@@ -275,7 +275,7 @@ Status Code **200**
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/llm-proxies/{id} \
+curl -X GET http://localhost:9090/api/management/v1/llm-proxies/{id} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -304,7 +304,7 @@ Required roles: `admin`, `developer`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "LlmProxy",
   "metadata": {
     "name": "openai-proxy"
@@ -346,7 +346,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X PUT http://localhost:9090/api/management/v0.9/llm-proxies/{id} \
+curl -X PUT http://localhost:9090/api/management/v1/llm-proxies/{id} \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -360,7 +360,7 @@ Update an existing LLM proxy in the Gateway.
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "LlmProxy",
   "metadata": {
     "name": "openai-proxy"
@@ -399,7 +399,7 @@ Required roles: `admin`, `developer`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "LlmProxy",
   "metadata": {
     "name": "openai-proxy"
@@ -442,7 +442,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X DELETE http://localhost:9090/api/management/v0.9/llm-proxies/{id} \
+curl -X DELETE http://localhost:9090/api/management/v1/llm-proxies/{id} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -505,7 +505,7 @@ Status Code **200**
 
 ```shell
 
-curl -X POST http://localhost:9090/api/management/v0.9/llm-proxies/{id}/api-keys \
+curl -X POST http://localhost:9090/api/management/v1/llm-proxies/{id}/api-keys \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -582,7 +582,7 @@ Required roles: `admin`, `consumer`
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/llm-proxies/{id}/api-keys \
+curl -X GET http://localhost:9090/api/management/v1/llm-proxies/{id}/api-keys \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -647,7 +647,7 @@ Required roles: `admin`, `consumer`
 
 ```shell
 
-curl -X POST http://localhost:9090/api/management/v0.9/llm-proxies/{id}/api-keys/{apiKeyName}/regenerate \
+curl -X POST http://localhost:9090/api/management/v1/llm-proxies/{id}/api-keys/{apiKeyName}/regenerate \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -722,7 +722,7 @@ Required roles: `admin`, `consumer`
 
 ```shell
 
-curl -X PUT http://localhost:9090/api/management/v0.9/llm-proxies/{id}/api-keys/{apiKeyName} \
+curl -X PUT http://localhost:9090/api/management/v1/llm-proxies/{id}/api-keys/{apiKeyName} \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -800,7 +800,7 @@ Required roles: `admin`, `consumer`
 
 ```shell
 
-curl -X DELETE http://localhost:9090/api/management/v0.9/llm-proxies/{id}/api-keys/{apiKeyName} \
+curl -X DELETE http://localhost:9090/api/management/v1/llm-proxies/{id}/api-keys/{apiKeyName} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
diff --git a/en/docs/api-gateway/next/gateway-controller-management-api/mcp-proxy-management.md b/en/docs/api-gateway/next/gateway-controller-management-api/mcp-proxy-management.md
index d565b000c..5fbbcc06c 100644
--- a/en/docs/api-gateway/next/gateway-controller-management-api/mcp-proxy-management.md
+++ b/en/docs/api-gateway/next/gateway-controller-management-api/mcp-proxy-management.md
@@ -26,7 +26,7 @@ CRUD operations for MCPProxies
 
 ```shell
 
-curl -X POST http://localhost:9090/api/management/v0.9/mcp-proxies \
+curl -X POST http://localhost:9090/api/management/v1/mcp-proxies \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -40,7 +40,7 @@ Add a new MCPProxy to the Gateway.
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "Mcp",
   "metadata": {
     "name": "everything-mcp-v1.0"
@@ -81,7 +81,7 @@ Required roles: `admin`, `developer`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "Mcp",
   "metadata": {
     "name": "everything-mcp-v1.0"
@@ -127,7 +127,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/mcp-proxies \
+curl -X GET http://localhost:9090/api/management/v1/mcp-proxies \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -170,7 +170,7 @@ Required roles: `admin`, `developer`
   "count": 5,
   "mcpProxies": [
     {
-      "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+      "apiVersion": "gateway.api-platform.wso2.com/v1",
       "kind": "Mcp",
       "metadata": {
         "name": "everything-mcp-v1.0"
@@ -317,7 +317,7 @@ Status Code **200**
 
 |Property|Value|
 |---|---|
-|apiVersion|gateway.api-platform.wso2.com/v1alpha1|
+|apiVersion|gateway.api-platform.wso2.com/v1|
 |kind|Mcp|
 |hostRewrite|auto|
 |hostRewrite|manual|
@@ -337,7 +337,7 @@ Status Code **200**
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/mcp-proxies/{id} \
+curl -X GET http://localhost:9090/api/management/v1/mcp-proxies/{id} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -370,7 +370,7 @@ Required roles: `admin`, `developer`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "Mcp",
   "metadata": {
     "name": "everything-mcp-v1.0"
@@ -415,7 +415,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X PUT http://localhost:9090/api/management/v0.9/mcp-proxies/{id} \
+curl -X PUT http://localhost:9090/api/management/v1/mcp-proxies/{id} \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -429,7 +429,7 @@ Update an existing MCPProxy in the Gateway.
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "Mcp",
   "metadata": {
     "name": "everything-mcp-v1.0"
@@ -475,7 +475,7 @@ Required roles: `admin`, `developer`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "Mcp",
   "metadata": {
     "name": "everything-mcp-v1.0"
@@ -521,7 +521,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X DELETE http://localhost:9090/api/management/v0.9/mcp-proxies/{id} \
+curl -X DELETE http://localhost:9090/api/management/v1/mcp-proxies/{id} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
diff --git a/en/docs/api-gateway/next/gateway-controller-management-api/overview.md b/en/docs/api-gateway/next/gateway-controller-management-api/overview.md
index ef5e890cb..577eebd2a 100644
--- a/en/docs/api-gateway/next/gateway-controller-management-api/overview.md
+++ b/en/docs/api-gateway/next/gateway-controller-management-api/overview.md
@@ -11,14 +11,14 @@ last_updated: 2026-06-17
 content_type: "overview"
 ---
 
-# Gateway Controller Management API v0.9.0
+# Gateway Controller Management API v1.0
 
 The Gateway Controller Management API is a RESTful API for managing configurations in the WSO2 API Platform Gateway.
 
 The API exposes the following endpoints:
 
-* `http://localhost:9090/api/management/v0.9`
-* `http://gateway-controller:9090/api/management/v0.9`
+* `http://localhost:9090/api/management/v1`
+* `http://gateway-controller:9090/api/management/v1`
 
 ## Table of Contents
 
diff --git a/en/docs/api-gateway/next/gateway-controller-management-api/rest-api-management.md b/en/docs/api-gateway/next/gateway-controller-management-api/rest-api-management.md
index 7d3b7e0fa..d7048f7d5 100644
--- a/en/docs/api-gateway/next/gateway-controller-management-api/rest-api-management.md
+++ b/en/docs/api-gateway/next/gateway-controller-management-api/rest-api-management.md
@@ -26,7 +26,7 @@ CRUD operations for Rest APIs
 
 ```shell
 
-curl -X POST http://localhost:9090/api/management/v0.9/rest-apis \
+curl -X POST http://localhost:9090/api/management/v1/rest-apis \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -40,7 +40,7 @@ Add a new RestAPI to the Gateway.
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "RestApi",
   "metadata": {
     "name": "reading-list-api-v1.0"
@@ -125,7 +125,7 @@ Required roles: `admin`, `developer`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "RestApi",
   "metadata": {
     "name": "reading-list-api-v1.0"
@@ -215,7 +215,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/rest-apis \
+curl -X GET http://localhost:9090/api/management/v1/rest-apis \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -258,7 +258,7 @@ Required roles: `admin`, `developer`
   "count": 5,
   "apis": [
     {
-      "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+      "apiVersion": "gateway.api-platform.wso2.com/v1",
       "kind": "RestApi",
       "metadata": {
         "name": "reading-list-api-v1.0"
@@ -427,7 +427,7 @@ Status Code **200**
 
 |Property|Value|
 |---|---|
-|apiVersion|gateway.api-platform.wso2.com/v1alpha1|
+|apiVersion|gateway.api-platform.wso2.com/v1|
 |kind|RestApi|
 |hostRewrite|auto|
 |hostRewrite|manual|
@@ -453,7 +453,7 @@ Status Code **200**
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/rest-apis/{id} \
+curl -X GET http://localhost:9090/api/management/v1/rest-apis/{id} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -486,7 +486,7 @@ Required roles: `admin`, `developer`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "RestApi",
   "metadata": {
     "name": "reading-list-api-v1.0"
@@ -575,7 +575,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X PUT http://localhost:9090/api/management/v0.9/rest-apis/{id} \
+curl -X PUT http://localhost:9090/api/management/v1/rest-apis/{id} \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -589,7 +589,7 @@ Update an existing RestAPI in the Gateway.
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "RestApi",
   "metadata": {
     "name": "reading-list-api-v1.0"
@@ -679,7 +679,7 @@ Required roles: `admin`, `developer`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "RestApi",
   "metadata": {
     "name": "reading-list-api-v1.0"
@@ -769,7 +769,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X DELETE http://localhost:9090/api/management/v0.9/rest-apis/{id} \
+curl -X DELETE http://localhost:9090/api/management/v1/rest-apis/{id} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -836,7 +836,7 @@ Status Code **200**
 
 ```shell
 
-curl -X POST http://localhost:9090/api/management/v0.9/rest-apis/{id}/api-keys \
+curl -X POST http://localhost:9090/api/management/v1/rest-apis/{id}/api-keys \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -916,7 +916,7 @@ Required roles: `admin`, `consumer`
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/rest-apis/{id}/api-keys \
+curl -X GET http://localhost:9090/api/management/v1/rest-apis/{id}/api-keys \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -985,7 +985,7 @@ Required roles: `admin`, `consumer`
 
 ```shell
 
-curl -X POST http://localhost:9090/api/management/v0.9/rest-apis/{id}/api-keys/{apiKeyName}/regenerate \
+curl -X POST http://localhost:9090/api/management/v1/rest-apis/{id}/api-keys/{apiKeyName}/regenerate \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -1066,7 +1066,7 @@ Required roles: `admin`, `consumer`
 
 ```shell
 
-curl -X PUT http://localhost:9090/api/management/v0.9/rest-apis/{id}/api-keys/{apiKeyName} \
+curl -X PUT http://localhost:9090/api/management/v1/rest-apis/{id}/api-keys/{apiKeyName} \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -1149,7 +1149,7 @@ Required roles: `admin`, `consumer`
 
 ```shell
 
-curl -X DELETE http://localhost:9090/api/management/v0.9/rest-apis/{id}/api-keys/{apiKeyName} \
+curl -X DELETE http://localhost:9090/api/management/v1/rest-apis/{id}/api-keys/{apiKeyName} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -1209,7 +1209,7 @@ Required roles: `admin`, `consumer`
 
 ```shell
 
-curl -X POST http://localhost:9090/api/management/v0.9/subscription-plans \
+curl -X POST http://localhost:9090/api/management/v1/subscription-plans \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -1287,7 +1287,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/subscription-plans \
+curl -X GET http://localhost:9090/api/management/v1/subscription-plans \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -1346,7 +1346,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/subscription-plans/{planId} \
+curl -X GET http://localhost:9090/api/management/v1/subscription-plans/{planId} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -1407,7 +1407,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X PUT http://localhost:9090/api/management/v0.9/subscription-plans/{planId} \
+curl -X PUT http://localhost:9090/api/management/v1/subscription-plans/{planId} \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -1485,7 +1485,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X DELETE http://localhost:9090/api/management/v0.9/subscription-plans/{planId} \
+curl -X DELETE http://localhost:9090/api/management/v1/subscription-plans/{planId} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -1543,7 +1543,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X POST http://localhost:9090/api/management/v0.9/subscriptions \
+curl -X POST http://localhost:9090/api/management/v1/subscriptions \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -1621,7 +1621,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/subscriptions \
+curl -X GET http://localhost:9090/api/management/v1/subscriptions \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -1696,7 +1696,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/subscriptions/{subscriptionId} \
+curl -X GET http://localhost:9090/api/management/v1/subscriptions/{subscriptionId} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -1757,7 +1757,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X PUT http://localhost:9090/api/management/v0.9/subscriptions/{subscriptionId} \
+curl -X PUT http://localhost:9090/api/management/v1/subscriptions/{subscriptionId} \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -1829,7 +1829,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X DELETE http://localhost:9090/api/management/v0.9/subscriptions/{subscriptionId} \
+curl -X DELETE http://localhost:9090/api/management/v1/subscriptions/{subscriptionId} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
diff --git a/en/docs/api-gateway/next/gateway-controller-management-api/schemas.md b/en/docs/api-gateway/next/gateway-controller-management-api/schemas.md
index 5f2c1563f..a6ee781fb 100644
--- a/en/docs/api-gateway/next/gateway-controller-management-api/schemas.md
+++ b/en/docs/api-gateway/next/gateway-controller-management-api/schemas.md
@@ -59,7 +59,7 @@ Server-managed lifecycle information for a resource
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "RestApi",
   "metadata": {
     "name": "reading-list-api-v1.0"
@@ -137,7 +137,7 @@ Server-managed lifecycle information for a resource
 
 |Property|Value|
 |---|---|
-|apiVersion|gateway.api-platform.wso2.com/v1alpha1|
+|apiVersion|gateway.api-platform.wso2.com/v1|
 |kind|RestApi|
 
 <h2 id="tocS_RestAPI">RestAPI</h2>
@@ -149,7 +149,7 @@ Server-managed lifecycle information for a resource
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "RestApi",
   "metadata": {
     "name": "reading-list-api-v1.0"
@@ -245,7 +245,7 @@ and
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "WebSubApi",
   "metadata": {
     "name": "github-events-v1.0"
@@ -282,7 +282,7 @@ and
 
 |Property|Value|
 |---|---|
-|apiVersion|gateway.api-platform.wso2.com/v1alpha1|
+|apiVersion|gateway.api-platform.wso2.com/v1|
 |kind|WebSubApi|
 
 <h2 id="tocS_WebSubAPI">WebSubAPI</h2>
@@ -294,7 +294,7 @@ and
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "WebSubApi",
   "metadata": {
     "name": "github-events-v1.0"
@@ -1077,7 +1077,7 @@ Channel (topic/event stream) definition for async APIs.
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "WebBrokerApi",
   "metadata": {
     "name": "stock-trading-v1.0"
@@ -1148,7 +1148,7 @@ Channel (topic/event stream) definition for async APIs.
 
 |Property|Value|
 |---|---|
-|apiVersion|gateway.api-platform.wso2.com/v1alpha1|
+|apiVersion|gateway.api-platform.wso2.com/v1|
 |kind|WebBrokerApi|
 
 <h2 id="tocS_WebBrokerApi">WebBrokerApi</h2>
@@ -1160,7 +1160,7 @@ Channel (topic/event stream) definition for async APIs.
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "WebBrokerApi",
   "metadata": {
     "name": "stock-trading-v1.0"
@@ -2180,7 +2180,7 @@ Details of an API key
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "Mcp",
   "metadata": {
     "name": "everything-mcp-v1.0"
@@ -2214,7 +2214,7 @@ Details of an API key
 
 |Property|Value|
 |---|---|
-|apiVersion|gateway.api-platform.wso2.com/v1alpha1|
+|apiVersion|gateway.api-platform.wso2.com/v1|
 |kind|Mcp|
 
 <h2 id="tocS_MCPProxyConfiguration">MCPProxyConfiguration</h2>
@@ -2226,7 +2226,7 @@ Details of an API key
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "Mcp",
   "metadata": {
     "name": "everything-mcp-v1.0"
@@ -2535,7 +2535,7 @@ continued
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "LlmProviderTemplate",
   "metadata": {
     "name": "openai-template"
@@ -2584,7 +2584,7 @@ continued
 
 |Property|Value|
 |---|---|
-|apiVersion|gateway.api-platform.wso2.com/v1alpha1|
+|apiVersion|gateway.api-platform.wso2.com/v1|
 |kind|LlmProviderTemplate|
 
 <h2 id="tocS_LLMProviderTemplate">LLMProviderTemplate</h2>
@@ -2596,7 +2596,7 @@ continued
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "LlmProviderTemplate",
   "metadata": {
     "name": "openai-template"
@@ -2872,7 +2872,7 @@ and
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "LlmProvider",
   "metadata": {
     "name": "wso2-openai-provider"
@@ -2931,7 +2931,7 @@ and
 
 |Property|Value|
 |---|---|
-|apiVersion|gateway.api-platform.wso2.com/v1alpha1|
+|apiVersion|gateway.api-platform.wso2.com/v1|
 |kind|LlmProvider|
 
 <h2 id="tocS_LLMProviderConfiguration">LLMProviderConfiguration</h2>
@@ -2943,7 +2943,7 @@ and
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "LlmProvider",
   "metadata": {
     "name": "wso2-openai-provider"
@@ -3320,7 +3320,7 @@ continued
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "LlmProxy",
   "metadata": {
     "name": "openai-proxy"
@@ -3351,7 +3351,7 @@ continued
 
 |Property|Value|
 |---|---|
-|apiVersion|gateway.api-platform.wso2.com/v1alpha1|
+|apiVersion|gateway.api-platform.wso2.com/v1|
 |kind|LlmProxy|
 
 <h2 id="tocS_LLMProxyConfiguration">LLMProxyConfiguration</h2>
@@ -3363,7 +3363,7 @@ continued
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "LlmProxy",
   "metadata": {
     "name": "openai-proxy"
@@ -3472,7 +3472,7 @@ and
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "Secret",
   "metadata": {
     "name": "database-password"
@@ -3499,7 +3499,7 @@ and
 
 |Property|Value|
 |---|---|
-|apiVersion|gateway.api-platform.wso2.com/v1alpha1|
+|apiVersion|gateway.api-platform.wso2.com/v1|
 |kind|Secret|
 
 <h2 id="tocS_SecretConfiguration">SecretConfiguration</h2>
@@ -3511,7 +3511,7 @@ and
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "Secret",
   "metadata": {
     "name": "database-password"
@@ -3605,7 +3605,7 @@ and
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "Secret",
   "metadata": {
     "name": "database-password"
@@ -3636,7 +3636,7 @@ and
 
 |Property|Value|
 |---|---|
-|apiVersion|gateway.api-platform.wso2.com/v1alpha1|
+|apiVersion|gateway.api-platform.wso2.com/v1|
 |kind|Secret|
 
 <h2 id="tocS_CertificateUploadRequest">CertificateUploadRequest</h2>
@@ -3788,7 +3788,7 @@ and
   "count": 5,
   "secrets": [
     {
-      "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+      "apiVersion": "gateway.api-platform.wso2.com/v1",
       "kind": "Secret",
       "metadata": {
         "name": "database-password"
@@ -3851,7 +3851,7 @@ Id and optional timestamps. Not the full ResourceStatus model (no `state` or
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "Secret",
   "metadata": {
     "name": "database-password"
@@ -3885,7 +3885,7 @@ POST/PUT /secrets response. `spec.value` is not returned; see SecretConfiguratio
 
 |Property|Value|
 |---|---|
-|apiVersion|gateway.api-platform.wso2.com/v1alpha1|
+|apiVersion|gateway.api-platform.wso2.com/v1|
 |kind|Secret|
 
 <h2 id="tocS_SecretConfigurationResponseRetrieved">SecretConfigurationResponseRetrieved</h2>
@@ -3897,7 +3897,7 @@ POST/PUT /secrets response. `spec.value` is not returned; see SecretConfiguratio
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "Secret",
   "metadata": {
     "name": "database-password"
@@ -3932,5 +3932,5 @@ GET /secrets/{id} response including decrypted `spec.value`.
 
 |Property|Value|
 |---|---|
-|apiVersion|gateway.api-platform.wso2.com/v1alpha1|
+|apiVersion|gateway.api-platform.wso2.com/v1|
 |kind|Secret|
\ No newline at end of file
diff --git a/en/docs/api-gateway/next/gateway-controller-management-api/secrets-management.md b/en/docs/api-gateway/next/gateway-controller-management-api/secrets-management.md
index dd5d686be..660d79f47 100644
--- a/en/docs/api-gateway/next/gateway-controller-management-api/secrets-management.md
+++ b/en/docs/api-gateway/next/gateway-controller-management-api/secrets-management.md
@@ -26,7 +26,7 @@ CRUD operations for Secrets
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/secrets \
+curl -X GET http://localhost:9090/api/management/v1/secrets \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -54,7 +54,7 @@ Required roles: `admin`
   "count": 5,
   "secrets": [
     {
-      "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+      "apiVersion": "gateway.api-platform.wso2.com/v1",
       "kind": "Secret",
       "metadata": {
         "name": "database-password"
@@ -90,7 +90,7 @@ Required roles: `admin`
 
 ```shell
 
-curl -X POST http://localhost:9090/api/management/v0.9/secrets \
+curl -X POST http://localhost:9090/api/management/v1/secrets \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -105,7 +105,7 @@ The value is encrypted using the primary encryption provider before persistence.
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "Secret",
   "metadata": {
     "name": "database-password"
@@ -139,7 +139,7 @@ Required roles: `admin`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "Secret",
   "metadata": {
     "name": "database-password"
@@ -191,7 +191,7 @@ Required roles: `admin`
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/secrets/{id} \
+curl -X GET http://localhost:9090/api/management/v1/secrets/{id} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -222,7 +222,7 @@ Required roles: `admin`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "Secret",
   "metadata": {
     "name": "database-password"
@@ -274,7 +274,7 @@ Required roles: `admin`
 
 ```shell
 
-curl -X PUT http://localhost:9090/api/management/v0.9/secrets/{id} \
+curl -X PUT http://localhost:9090/api/management/v1/secrets/{id} \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -290,7 +290,7 @@ to newer keys during updates. Old secrets remain readable via the provider chain
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "Secret",
   "metadata": {
     "name": "database-password"
@@ -325,7 +325,7 @@ Required roles: `admin`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "Secret",
   "metadata": {
     "name": "database-password"
@@ -377,7 +377,7 @@ Required roles: `admin`
 
 ```shell
 
-curl -X DELETE http://localhost:9090/api/management/v0.9/secrets/{id} \
+curl -X DELETE http://localhost:9090/api/management/v1/secrets/{id} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
diff --git a/en/docs/api-gateway/next/gateway-controller-management-api/webbroker-api-management.md b/en/docs/api-gateway/next/gateway-controller-management-api/webbroker-api-management.md
index 30bcb1c5c..fac211b41 100644
--- a/en/docs/api-gateway/next/gateway-controller-management-api/webbroker-api-management.md
+++ b/en/docs/api-gateway/next/gateway-controller-management-api/webbroker-api-management.md
@@ -23,7 +23,7 @@ content_type: "reference"
 
 ```shell
 
-curl -X POST http://localhost:9090/api/management/v0.9/webbroker-apis \
+curl -X POST http://localhost:9090/api/management/v1/webbroker-apis \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -37,7 +37,7 @@ Add a new WebBrokerAPI to the Gateway. WebBrokerAPI provides bidirectional strea
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "WebBrokerApi",
   "metadata": {
     "name": "stock-trading-v1.0"
@@ -115,7 +115,7 @@ Required roles: `admin`, `developer`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "WebBrokerApi",
   "metadata": {
     "name": "stock-trading-v1.0"
@@ -198,7 +198,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/webbroker-apis \
+curl -X GET http://localhost:9090/api/management/v1/webbroker-apis \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -240,7 +240,7 @@ Required roles: `admin`, `developer`
   "count": 3,
   "apis": [
     {
-      "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+      "apiVersion": "gateway.api-platform.wso2.com/v1",
       "kind": "WebBrokerApi",
       "metadata": {
         "name": "stock-trading-v1.0"
@@ -387,7 +387,7 @@ Status Code **200**
 
 |Property|Value|
 |---|---|
-|apiVersion|gateway.api-platform.wso2.com/v1alpha1|
+|apiVersion|gateway.api-platform.wso2.com/v1|
 |kind|WebBrokerApi|
 |deploymentState|deployed|
 |deploymentState|undeployed|
@@ -404,7 +404,7 @@ Status Code **200**
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/webbroker-apis/{id} \
+curl -X GET http://localhost:9090/api/management/v1/webbroker-apis/{id} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -437,7 +437,7 @@ Required roles: `admin`, `developer`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "WebBrokerApi",
   "metadata": {
     "name": "stock-trading-v1.0"
@@ -519,7 +519,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X DELETE http://localhost:9090/api/management/v0.9/webbroker-apis/{id} \
+curl -X DELETE http://localhost:9090/api/management/v1/webbroker-apis/{id} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
diff --git a/en/docs/api-gateway/next/gateway-controller-management-api/websub-api-management.md b/en/docs/api-gateway/next/gateway-controller-management-api/websub-api-management.md
index 8a0198c91..0cf7177f3 100644
--- a/en/docs/api-gateway/next/gateway-controller-management-api/websub-api-management.md
+++ b/en/docs/api-gateway/next/gateway-controller-management-api/websub-api-management.md
@@ -23,7 +23,7 @@ content_type: "reference"
 
 ```shell
 
-curl -X POST http://localhost:9090/api/management/v0.9/websub-apis \
+curl -X POST http://localhost:9090/api/management/v1/websub-apis \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -37,7 +37,7 @@ Add a new WebSubAPI to the Gateway.
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "WebSubApi",
   "metadata": {
     "name": "github-events-v1.0"
@@ -81,7 +81,7 @@ Required roles: `admin`, `developer`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "WebSubApi",
   "metadata": {
     "name": "github-events-v1.0"
@@ -130,7 +130,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/websub-apis \
+curl -X GET http://localhost:9090/api/management/v1/websub-apis \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -173,7 +173,7 @@ Required roles: `admin`, `developer`
   "count": 5,
   "apis": [
     {
-      "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+      "apiVersion": "gateway.api-platform.wso2.com/v1",
       "kind": "WebSubApi",
       "metadata": {
         "name": "github-events-v1.0"
@@ -276,7 +276,7 @@ Status Code **200**
 
 |Property|Value|
 |---|---|
-|apiVersion|gateway.api-platform.wso2.com/v1alpha1|
+|apiVersion|gateway.api-platform.wso2.com/v1|
 |kind|WebSubApi|
 |deploymentState|deployed|
 |deploymentState|undeployed|
@@ -293,7 +293,7 @@ Status Code **200**
 
 ```shell
 
-curl -X POST http://localhost:9090/api/management/v0.9/websub-apis/{id}/api-keys \
+curl -X POST http://localhost:9090/api/management/v1/websub-apis/{id}/api-keys \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -370,7 +370,7 @@ Required roles: `admin`, `consumer`
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/websub-apis/{id}/api-keys \
+curl -X GET http://localhost:9090/api/management/v1/websub-apis/{id}/api-keys \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -435,7 +435,7 @@ Required roles: `admin`, `consumer`
 
 ```shell
 
-curl -X POST http://localhost:9090/api/management/v0.9/websub-apis/{id}/api-keys/{apiKeyName}/regenerate \
+curl -X POST http://localhost:9090/api/management/v1/websub-apis/{id}/api-keys/{apiKeyName}/regenerate \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -510,7 +510,7 @@ Required roles: `admin`, `consumer`
 
 ```shell
 
-curl -X PUT http://localhost:9090/api/management/v0.9/websub-apis/{id}/api-keys/{apiKeyName} \
+curl -X PUT http://localhost:9090/api/management/v1/websub-apis/{id}/api-keys/{apiKeyName} \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -588,7 +588,7 @@ Required roles: `admin`, `consumer`
 
 ```shell
 
-curl -X DELETE http://localhost:9090/api/management/v0.9/websub-apis/{id}/api-keys/{apiKeyName} \
+curl -X DELETE http://localhost:9090/api/management/v1/websub-apis/{id}/api-keys/{apiKeyName} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -642,7 +642,7 @@ Required roles: `admin`, `consumer`
 
 ```shell
 
-curl -X GET http://localhost:9090/api/management/v0.9/websub-apis/{id} \
+curl -X GET http://localhost:9090/api/management/v1/websub-apis/{id} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
@@ -675,7 +675,7 @@ Required roles: `admin`, `developer`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "WebSubApi",
   "metadata": {
     "name": "github-events-v1.0"
@@ -723,7 +723,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X PUT http://localhost:9090/api/management/v0.9/websub-apis/{id} \
+curl -X PUT http://localhost:9090/api/management/v1/websub-apis/{id} \
   -u {username}:{password} \
   -H 'Content-Type: application/json' \
   -H 'Accept: application/json' \
@@ -737,7 +737,7 @@ Update an existing WebSubAPI in the Gateway.
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "WebSubApi",
   "metadata": {
     "name": "github-events-v1.0"
@@ -786,7 +786,7 @@ Required roles: `admin`, `developer`
 
 ```json
 {
-  "apiVersion": "gateway.api-platform.wso2.com/v1alpha1",
+  "apiVersion": "gateway.api-platform.wso2.com/v1",
   "kind": "WebSubApi",
   "metadata": {
     "name": "github-events-v1.0"
@@ -835,7 +835,7 @@ Required roles: `admin`, `developer`
 
 ```shell
 
-curl -X DELETE http://localhost:9090/api/management/v0.9/websub-apis/{id} \
+curl -X DELETE http://localhost:9090/api/management/v1/websub-apis/{id} \
   -u {username}:{password} \
   -H 'Accept: application/json'
 
diff --git a/en/docs/cloud/ai-workspace/configure-inbound-auth.md b/en/docs/cloud/ai-workspace/configure-inbound-auth.md
index 5bec363e2..55ef5b7df 100644
--- a/en/docs/cloud/ai-workspace/configure-inbound-auth.md
+++ b/en/docs/cloud/ai-workspace/configure-inbound-auth.md
@@ -28,6 +28,7 @@ The API key itself is generated by the AI Workspace (shown once at creation, val
 |-------|-------------|
 | **Authentication** | Authentication type. Currently `apiKey` is the only supported option. |
 | **API Key** / **Key name** | The name of the request header that must carry the API key. Defaults to `X-API-Key`. |
+| **Key Location** / **Sent in** | Currently, `header` is the only supported option. |
 
 ## Default Behaviour: X-API-Key Header
 
diff --git a/en/docs/cloud/ai-workspace/llm-providers/manage-provider.md b/en/docs/cloud/ai-workspace/llm-providers/manage-provider.md
index 7822bab4a..5601cd263 100644
--- a/en/docs/cloud/ai-workspace/llm-providers/manage-provider.md
+++ b/en/docs/cloud/ai-workspace/llm-providers/manage-provider.md
@@ -133,6 +133,7 @@ Set up the API key that client applications must provide:
 |-------|-------------|---------|
 | **Authentication Type** | Authentication method | `apiKey` (default) |
 | **API Key Name** | Name of the request header that must carry the API key | `x-api-key`, `apikey`, `Authorization` |
+| **Key Location** | Currently, `header` is the only supported option. | — |
 
 **To configure:**
 
@@ -272,8 +273,8 @@ The **Models** tab displays a chip list of the models available through this pro
 
 **To add a model:**
 
-1. Type or paste the model ID into the input field and press <kbd>Enter</kbd>, or select it from the autocomplete list.
-2. The model chip appears in the list.
+1. Click **Add model provider**, select a provider from the list, and click **Add** to import its model catalog.
+2. Type or paste individual model IDs into the input field and press <kbd>Enter</kbd> to add them as chips.
 3. Click **Save**, then **Deploy to Gateway** to apply the change.
 
 **To remove a model:**
diff --git a/en/docs/cloud/ai-workspace/llm-proxies/manage-proxy.md b/en/docs/cloud/ai-workspace/llm-proxies/manage-proxy.md
index b33253075..26c63569b 100644
--- a/en/docs/cloud/ai-workspace/llm-proxies/manage-proxy.md
+++ b/en/docs/cloud/ai-workspace/llm-proxies/manage-proxy.md
@@ -144,14 +144,10 @@ Configure how client applications authenticate when accessing your proxy endpoin
 | Field | Description |
 |-------|-------------|
 | **Authentication type** | Select the authentication method from the dropdown. Currently, **API Key** is available. |
-| **Key name** | The name of the key that clients must provide (e.g., `X-API-Key`). |
-| **Sent in** | Choose how clients send the authentication key: **Header** (recommended) or **Query Parameter**. |
-
+| **Key name** | The name of the request header that clients must provide (e.g., `X-API-Key`). |
+| **Sent in** | Currently, `header` is the only supported option. |
 3. Click **Save** to apply the security configuration.
 
-!!! tip "Best Practice"
-    Use **Header** authentication for production environments. Query parameters may be logged in server access logs and browser history.
-
 ---
 
 ## Guardrails
diff --git a/en/docs/next/ai-workspace/configure-inbound-auth.md b/en/docs/next/ai-workspace/configure-inbound-auth.md
index 69dd10324..55ef5b7df 100644
--- a/en/docs/next/ai-workspace/configure-inbound-auth.md
+++ b/en/docs/next/ai-workspace/configure-inbound-auth.md
@@ -1,6 +1,6 @@
 ---
 title: "Configure inbound authentication"
-description: "Control where and under what name client applications send their API key when calling a deployed LLM provider or App LLM proxy."
+description: "Control the header name client applications use to send their API key when calling a deployed LLM provider or App LLM proxy."
 canonical_url: https://wso2.com/api-platform/docs/cloud/ai-workspace/configure-inbound-auth/
 md_url: https://wso2.com/api-platform/docs/cloud/ai-workspace/configure-inbound-auth.md
 tags:
@@ -18,17 +18,17 @@ The **Security** tab on both LLM Providers and App LLM Proxies controls how clie
 
 ## How It Works
 
-When a provider or proxy is deployed, the gateway enforces inbound authentication on every incoming request. Clients must include a valid API key in the location and under the name you configure in the Security tab.
+When a provider or proxy is deployed, the gateway enforces inbound authentication on every incoming request. Clients must include a valid API key in the request header, under the name you configure in the Security tab.
 
-The API key itself is generated by the AI Workspace (shown once at creation, valid for 90 days). The Security tab controls **where** and **under what name** the client must send it.
+The API key itself is generated by the AI Workspace (shown once at creation, valid for 90 days). The Security tab controls **which header name** the client must use to send it.
 
 ## Security Tab Fields
 
 | Field | Description |
 |-------|-------------|
 | **Authentication** | Authentication type. Currently `apiKey` is the only supported option. |
-| **API Key** / **Key name** | The name of the header or query parameter that must carry the API key. Defaults to `X-API-Key`. |
-| **Key Location** / **Sent in** | Whether the key is expected in a request `header` or as a `query` parameter. Defaults to `header`. |
+| **API Key** / **Key name** | The name of the request header that must carry the API key. Defaults to `X-API-Key`. |
+| **Key Location** / **Sent in** | Currently, `header` is the only supported option. |
 
 ## Default Behaviour: X-API-Key Header
 
@@ -53,20 +53,9 @@ SDKs such as the OpenAI SDK, Mistral SDK, and Azure OpenAI SDK all send an `Auth
 !!! note
     The gateway validates the key value regardless of prefix — it strips a leading `Bearer ` before comparing against the stored key.
 
-## Sending the Key as a Query Parameter
-
-If you set **Key Location** to `query`, clients append the key to the request URL instead:
-
-```
-https://<gateway-host>/<context>?<key-name>=<your-api-key>
-```
-
-This is useful in environments where setting custom request headers is not straightforward.
-
 ## Steps to Configure
 
 1. Open your LLM Provider or App LLM Proxy and go to the **Security** tab.
-2. Set the **API Key** / **Key name** field to the header or query parameter name your application will use.
-3. Set **Key Location** / **Sent in** to `header` or `query` as appropriate.
-4. Click **Save**.
-5. **Deploy to Gateway** — security changes take effect only after redeployment.
+2. Set the **API Key** / **Key name** field to the header name your application will use.
+3. Click **Save**.
+4. **Deploy to Gateway** — security changes take effect only after redeployment.
diff --git a/en/docs/next/ai-workspace/llm-providers/manage-provider.md b/en/docs/next/ai-workspace/llm-providers/manage-provider.md
index bc543e0d9..44076dc85 100644
--- a/en/docs/next/ai-workspace/llm-providers/manage-provider.md
+++ b/en/docs/next/ai-workspace/llm-providers/manage-provider.md
@@ -143,6 +143,7 @@ Set up the API key that client applications must provide:
 |-------|-------------|---------|
 | **Authentication Type** | Authentication method | `apiKey` (default) |
 | **API Key** | Name of the request header that must carry the API key | `x-api-key`, `apikey`, `Authorization` |
+| **Key Location** | Currently, `header` is the only supported option. | — |
 | **API Key Value Prefix** | Optional prefix prepended to the value clients must send, e.g. so clients send `Bearer <key>` | `Bearer` |
 
 **To configure:**
@@ -289,8 +290,8 @@ The **Models** tab displays a chip list of the models available through this pro
 
 **To add a model:**
 
-1. Type or paste the model ID into the input field and press <kbd>Enter</kbd>, or select it from the autocomplete list.
-2. The model chip appears in the list.
+1. Click **Add model provider**, select a provider from the list, and click **Add** to import its model catalog.
+2. Type or paste individual model IDs into the input field and press <kbd>Enter</kbd> to add them as chips.
 3. Click **Save**, then **Deploy to Gateway** to apply the change.
 
 **To remove a model:**
diff --git a/en/docs/next/ai-workspace/llm-proxies/manage-proxy.md b/en/docs/next/ai-workspace/llm-proxies/manage-proxy.md
index 3c4c05c1e..ee3c28b32 100644
--- a/en/docs/next/ai-workspace/llm-proxies/manage-proxy.md
+++ b/en/docs/next/ai-workspace/llm-proxies/manage-proxy.md
@@ -144,15 +144,11 @@ Configure how client applications authenticate when accessing your proxy endpoin
 | Field | Description |
 |-------|-------------|
 | **Authentication type** | Select the authentication method from the dropdown. Currently, **API Key** is available. |
-| **Key name** | The name of the key that clients must provide (e.g., `X-API-Key`). |
+| **Key name** | The name of the request header that clients must provide (e.g., `X-API-Key`). |
+| **Sent in** | Currently, `header` is the only supported option. |
 | **API Key Value Prefix** | Optional prefix prepended to the value clients must send, e.g. `Bearer` so clients send `Bearer <key>`. |
-| **Sent in** | Choose how clients send the authentication key: **Header** (recommended) or **Query Parameter**. |
-
 3. Click **Save** to apply the security configuration.
 
-!!! tip "Best Practice"
-    Use **Header** authentication for production environments. Query parameters may be logged in server access logs and browser history.
-
 ---
 
 ## Guardrails

From fe155dcc5ab74726a218150bf1a64a31ce8cc3c4 Mon Sep 17 00:00:00 2001
From: Naduni Pamudika <nadunipamudika@naduni.local>
Date: Thu, 30 Jul 2026 15:15:07 +0530
Subject: [PATCH 3/5] Revert cloud/ai-workspace doc changes

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 en/docs/cloud/ai-workspace/configure-inbound-auth.md      | 1 -
 .../cloud/ai-workspace/llm-providers/manage-provider.md   | 5 ++---
 en/docs/cloud/ai-workspace/llm-proxies/manage-proxy.md    | 8 ++++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/en/docs/cloud/ai-workspace/configure-inbound-auth.md b/en/docs/cloud/ai-workspace/configure-inbound-auth.md
index 55ef5b7df..5bec363e2 100644
--- a/en/docs/cloud/ai-workspace/configure-inbound-auth.md
+++ b/en/docs/cloud/ai-workspace/configure-inbound-auth.md
@@ -28,7 +28,6 @@ The API key itself is generated by the AI Workspace (shown once at creation, val
 |-------|-------------|
 | **Authentication** | Authentication type. Currently `apiKey` is the only supported option. |
 | **API Key** / **Key name** | The name of the request header that must carry the API key. Defaults to `X-API-Key`. |
-| **Key Location** / **Sent in** | Currently, `header` is the only supported option. |
 
 ## Default Behaviour: X-API-Key Header
 
diff --git a/en/docs/cloud/ai-workspace/llm-providers/manage-provider.md b/en/docs/cloud/ai-workspace/llm-providers/manage-provider.md
index 5601cd263..7822bab4a 100644
--- a/en/docs/cloud/ai-workspace/llm-providers/manage-provider.md
+++ b/en/docs/cloud/ai-workspace/llm-providers/manage-provider.md
@@ -133,7 +133,6 @@ Set up the API key that client applications must provide:
 |-------|-------------|---------|
 | **Authentication Type** | Authentication method | `apiKey` (default) |
 | **API Key Name** | Name of the request header that must carry the API key | `x-api-key`, `apikey`, `Authorization` |
-| **Key Location** | Currently, `header` is the only supported option. | — |
 
 **To configure:**
 
@@ -273,8 +272,8 @@ The **Models** tab displays a chip list of the models available through this pro
 
 **To add a model:**
 
-1. Click **Add model provider**, select a provider from the list, and click **Add** to import its model catalog.
-2. Type or paste individual model IDs into the input field and press <kbd>Enter</kbd> to add them as chips.
+1. Type or paste the model ID into the input field and press <kbd>Enter</kbd>, or select it from the autocomplete list.
+2. The model chip appears in the list.
 3. Click **Save**, then **Deploy to Gateway** to apply the change.
 
 **To remove a model:**
diff --git a/en/docs/cloud/ai-workspace/llm-proxies/manage-proxy.md b/en/docs/cloud/ai-workspace/llm-proxies/manage-proxy.md
index 26c63569b..b33253075 100644
--- a/en/docs/cloud/ai-workspace/llm-proxies/manage-proxy.md
+++ b/en/docs/cloud/ai-workspace/llm-proxies/manage-proxy.md
@@ -144,10 +144,14 @@ Configure how client applications authenticate when accessing your proxy endpoin
 | Field | Description |
 |-------|-------------|
 | **Authentication type** | Select the authentication method from the dropdown. Currently, **API Key** is available. |
-| **Key name** | The name of the request header that clients must provide (e.g., `X-API-Key`). |
-| **Sent in** | Currently, `header` is the only supported option. |
+| **Key name** | The name of the key that clients must provide (e.g., `X-API-Key`). |
+| **Sent in** | Choose how clients send the authentication key: **Header** (recommended) or **Query Parameter**. |
+
 3. Click **Save** to apply the security configuration.
 
+!!! tip "Best Practice"
+    Use **Header** authentication for production environments. Query parameters may be logged in server access logs and browser history.
+
 ---
 
 ## Guardrails

From 199676b9b189ba8c873068f259a9fc74b799830b Mon Sep 17 00:00:00 2001
From: Naduni Pamudika <nadunipamudika@naduni.local>
Date: Thu, 30 Jul 2026 15:18:40 +0530
Subject: [PATCH 4/5] Remove cloud/ai-workspace doc changes from PR

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../ai-workspace/configure-inbound-auth.md    | 26 ++++++++++----
 .../llm-providers/configure-provider.md       |  2 +-
 .../llm-providers/manage-provider.md          | 36 ++++++++++---------
 3 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/en/docs/cloud/ai-workspace/configure-inbound-auth.md b/en/docs/cloud/ai-workspace/configure-inbound-auth.md
index 5bec363e2..69dd10324 100644
--- a/en/docs/cloud/ai-workspace/configure-inbound-auth.md
+++ b/en/docs/cloud/ai-workspace/configure-inbound-auth.md
@@ -1,6 +1,6 @@
 ---
 title: "Configure inbound authentication"
-description: "Control the header name client applications use to send their API key when calling a deployed LLM provider or App LLM proxy."
+description: "Control where and under what name client applications send their API key when calling a deployed LLM provider or App LLM proxy."
 canonical_url: https://wso2.com/api-platform/docs/cloud/ai-workspace/configure-inbound-auth/
 md_url: https://wso2.com/api-platform/docs/cloud/ai-workspace/configure-inbound-auth.md
 tags:
@@ -18,16 +18,17 @@ The **Security** tab on both LLM Providers and App LLM Proxies controls how clie
 
 ## How It Works
 
-When a provider or proxy is deployed, the gateway enforces inbound authentication on every incoming request. Clients must include a valid API key in the request header, under the name you configure in the Security tab.
+When a provider or proxy is deployed, the gateway enforces inbound authentication on every incoming request. Clients must include a valid API key in the location and under the name you configure in the Security tab.
 
-The API key itself is generated by the AI Workspace (shown once at creation, valid for 90 days). The Security tab controls **which header name** the client must use to send it.
+The API key itself is generated by the AI Workspace (shown once at creation, valid for 90 days). The Security tab controls **where** and **under what name** the client must send it.
 
 ## Security Tab Fields
 
 | Field | Description |
 |-------|-------------|
 | **Authentication** | Authentication type. Currently `apiKey` is the only supported option. |
-| **API Key** / **Key name** | The name of the request header that must carry the API key. Defaults to `X-API-Key`. |
+| **API Key** / **Key name** | The name of the header or query parameter that must carry the API key. Defaults to `X-API-Key`. |
+| **Key Location** / **Sent in** | Whether the key is expected in a request `header` or as a `query` parameter. Defaults to `header`. |
 
 ## Default Behaviour: X-API-Key Header
 
@@ -52,9 +53,20 @@ SDKs such as the OpenAI SDK, Mistral SDK, and Azure OpenAI SDK all send an `Auth
 !!! note
     The gateway validates the key value regardless of prefix — it strips a leading `Bearer ` before comparing against the stored key.
 
+## Sending the Key as a Query Parameter
+
+If you set **Key Location** to `query`, clients append the key to the request URL instead:
+
+```
+https://<gateway-host>/<context>?<key-name>=<your-api-key>
+```
+
+This is useful in environments where setting custom request headers is not straightforward.
+
 ## Steps to Configure
 
 1. Open your LLM Provider or App LLM Proxy and go to the **Security** tab.
-2. Set the **API Key** / **Key name** field to the header name your application will use.
-3. Click **Save**.
-4. **Deploy to Gateway** — security changes take effect only after redeployment.
+2. Set the **API Key** / **Key name** field to the header or query parameter name your application will use.
+3. Set **Key Location** / **Sent in** to `header` or `query` as appropriate.
+4. Click **Save**.
+5. **Deploy to Gateway** — security changes take effect only after redeployment.
diff --git a/en/docs/cloud/ai-workspace/llm-providers/configure-provider.md b/en/docs/cloud/ai-workspace/llm-providers/configure-provider.md
index aff11c31f..1c26c04a9 100644
--- a/en/docs/cloud/ai-workspace/llm-providers/configure-provider.md
+++ b/en/docs/cloud/ai-workspace/llm-providers/configure-provider.md
@@ -28,7 +28,7 @@ LLM Providers allow you to connect AI service platforms like OpenAI, Anthropic,
 ## Add a New Provider
 
 1. Navigate to **AI Workspace** in your API Platform dashboard.
-2. Select **LLM Providers** from the menu.
+2. Select **Service Providers** from the menu.
 3. Click **+ Add New Provider** and choose your provider type (e.g., **OpenAI**, **Anthropic**).
 
    ![Add LLM Service Provider panel showing selectable tiles for OpenAI, Mistral, Gemini, Azure OpenAI, Azure AI Foundry, AWS Bedrock, and Anthropic](../../../assets/img/ai-gateway/ai-workspace/llm-provider/select-llm-provider-type.png)
diff --git a/en/docs/cloud/ai-workspace/llm-providers/manage-provider.md b/en/docs/cloud/ai-workspace/llm-providers/manage-provider.md
index 7822bab4a..bb1462380 100644
--- a/en/docs/cloud/ai-workspace/llm-providers/manage-provider.md
+++ b/en/docs/cloud/ai-workspace/llm-providers/manage-provider.md
@@ -132,13 +132,17 @@ Set up the API key that client applications must provide:
 | Field | Description | Example |
 |-------|-------------|---------|
 | **Authentication Type** | Authentication method | `apiKey` (default) |
-| **API Key Name** | Name of the request header that must carry the API key | `x-api-key`, `apikey`, `Authorization` |
+| **API Key Name** | Header or query parameter name | `x-api-key`, `apikey`, `Authorization` |
+| **Key Location** | Where clients send the key | `Header` (recommended) or `Query` |
 
 **To configure:**
 
-1. Select **Authentication Type**: `apiKey`.
-2. Enter the **API Key Name** header that applications will use.
-3. Click **Save**.
+1. Select **Authentication Type**: `apiKey`
+2. Enter **API Key Name** that applications will use
+3. Choose **Key Location**:
+    - **Header** - Sent in HTTP request header (most secure)
+    - **Query** - Sent as URL query parameter (less secure)
+4. Click **Save**
 
 ---
 
@@ -266,22 +270,22 @@ Configure which AI models are accessible through this provider.
 
 </div>
 
-### Add and remove models
+### Add Models
 
-The **Models** tab displays a chip list of the models available through this provider. Each chip represents one model ID.
+**To add new models:**
 
-**To add a model:**
+1. Click **Add model provider**
+2. Select a provider from the list to import its model catalog
+3. Click **Add**
+4. The models are added and enabled by default
 
-1. Type or paste the model ID into the input field and press <kbd>Enter</kbd>, or select it from the autocomplete list.
-2. The model chip appears in the list.
-3. Click **Save**, then **Deploy to Gateway** to apply the change.
+### Enable/Disable Models
 
-**To remove a model:**
+Control which models applications can access:
 
-1. Click the **×** on the model chip you want to remove.
-2. Click **Save**, then **Deploy to Gateway** to apply the change.
-
-Models not in the chip list are blocked at the gateway. Applications requesting a removed model receive an error.
+- **Toggle switches**: Enable/disable individual models
+- **Effect**: Disabled models are blocked at the gateway
+- Applications attempting to use disabled models will receive an error
 
 ---
 
@@ -297,7 +301,7 @@ Push configuration changes to deployed gateways.
 
 - After updating connection settings
 - After modifying rate limits or guardrails  
-- After adding or removing models
+- After enabling/disabling resources or models
 
 **To redeploy:**
 

From 987cc8b3adca172e279b90be8990b83299e8ea2c Mon Sep 17 00:00:00 2001
From: Naduni Pamudika <nadunipamudika@naduni.local>
Date: Fri, 31 Jul 2026 10:35:39 +0530
Subject: [PATCH 5/5] Fix formatting issue

---
 en/docs/next/ai-workspace/llm-proxies/manage-proxy.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/en/docs/next/ai-workspace/llm-proxies/manage-proxy.md b/en/docs/next/ai-workspace/llm-proxies/manage-proxy.md
index ee3c28b32..6b01022bd 100644
--- a/en/docs/next/ai-workspace/llm-proxies/manage-proxy.md
+++ b/en/docs/next/ai-workspace/llm-proxies/manage-proxy.md
@@ -147,6 +147,7 @@ Configure how client applications authenticate when accessing your proxy endpoin
 | **Key name** | The name of the request header that clients must provide (e.g., `X-API-Key`). |
 | **Sent in** | Currently, `header` is the only supported option. |
 | **API Key Value Prefix** | Optional prefix prepended to the value clients must send, e.g. `Bearer` so clients send `Bearer <key>`. |
+
 3. Click **Save** to apply the security configuration.
 
 ---