wso2 · Tharsanan1 · Dec 12, 2025
diff --git a/cli/src/utils/mcp.go b/cli/src/utils/mcp.go
@@ -274,7 +274,7 @@ func GenerateMCPConfigFile(url string, toolsResult ToolsResult,
 	resourcesResult ResourcesResult, promptsResult PromptsResult, outputDir string) error {
 	// Build YAML
 	mcp := McpYAML{
-		Version: "ai.api-platform.wso2.com/v1",
+		Version: "ai.api-platform.wso2.com/v1alpha1",
 		Kind:    "mcp",
 	}
 	mcp.Spec.Name = "Generated-MCP"

diff --git a/concepts/api-yaml-specification.md b/concepts/api-yaml-specification.md
@@ -12,7 +12,7 @@ The `api.yaml` format is a declarative specification for defining APIs that can
 
 ```yaml
 version: api-platform.wso2.com/v1
-kind: http/rest | graphql | grpc | asyncapi
+kind: RestApi | graphql | grpc | asyncapi
 data:
   # API metadata and configuration
 ```
@@ -26,7 +26,7 @@ data:
 | Field | Type | Required | Description |
 |-------|------|----------|-------------|
 | `version` | string | Yes | API specification version (currently `api-platform.wso2.com/v1`) |
-| `kind` | string | Yes | API type: `http/rest`, `graphql`, `grpc`, `asyncapi` |
+| `kind` | string | Yes | API type: `RestApi`, `graphql`, `grpc`, `asyncapi` |
 | `data` | object | Yes | API configuration and metadata |
 
 ### Data Object Fields
@@ -69,7 +69,7 @@ data:
 
 ```yaml
 version: api-platform.wso2.com/v1
-kind: http/rest
+kind: RestApi
 data:
   name: Weather API
   version: v1.0
@@ -89,7 +89,7 @@ data:
 
 ```yaml
 version: api-platform.wso2.com/v1
-kind: http/rest
+kind: RestApi
 data:
   name: User Management API
   version: v1.0

diff --git a/docs/gateway/Quick-start-guide.md b/docs/gateway/Quick-start-guide.md
@@ -38,7 +38,7 @@ curl -X POST http://localhost:9090/apis \
   -H "Content-Type: application/yaml" \
   --data-binary @- <<'EOF'
 version: api-platform.wso2.com/v1
-kind: http/rest
+kind: RestApi
 spec:
   name: Weather-API
   version: v1.0

diff --git a/docs/gateway/README.md b/docs/gateway/README.md
@@ -66,7 +66,7 @@ curl -X POST http://localhost:9090/apis \
   -H "Content-Type: application/yaml" \
   --data-binary @- <<'EOF'
 version: api-platform.wso2.com/v1
-kind: http/rest
+kind: RestApi
 spec:
   name: Weather-API
   version: v1.0
@@ -144,7 +144,7 @@ User → Gateway-Controller (REST API)
 
 ```yaml
 version: api-platform.wso2.com/v1
-kind: http/rest
+kind: RestApi
 data:
   name: Weather API
   version: v1.0

diff --git a/gateway/README.md b/gateway/README.md
@@ -66,7 +66,7 @@ curl -X POST http://localhost:9090/apis \
   -H "Content-Type: application/yaml" \
   --data-binary @- <<'EOF'
 version: api-platform.wso2.com/v1
-kind: http/rest
+kind: RestApi
 spec:
   name: Weather-API
   version: v1.0
@@ -144,7 +144,7 @@ User → Gateway-Controller (REST API)
 
 ```yaml
 version: api-platform.wso2.com/v1
-kind: http/rest
+kind: RestApi
 data:
   name: Weather API
   version: v1.0

diff --git a/gateway/examples/petstore-api.yaml b/gateway/examples/petstore-api.yaml
@@ -17,7 +17,7 @@
 # --------------------------------------------------------------------
 
 version: api-platform.wso2.com/v1
-kind: http/rest
+kind: RestApi
 spec:
   name: PetStore API test
   version: v1.0

diff --git a/gateway/examples/self-signed-secure-api.yaml b/gateway/examples/self-signed-secure-api.yaml
@@ -16,7 +16,7 @@
 # under the License.
 # --------------------------------------------------------------------
 version: api-platform.wso2.com/v1
-kind: http/rest
+kind: RestApi
 spec:
   name: self-signed-api
   version: v1.0

diff --git a/gateway/examples/test-api.yaml b/gateway/examples/test-api.yaml
@@ -0,0 +1,30 @@
+# --------------------------------------------------------------------
+# Copyright (c) 2025, WSO2 LLC. (https://www.wso2.com).
+#
+# WSO2 LLC. licenses this file to you under the Apache License,
+# Version 2.0 (the "License"); you may not use this file except
+# in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# --------------------------------------------------------------------
+
+version: api-platform.wso2.com/v1
+kind: RestApi
+spec:
+  name: test-api
+  version: v1.0
+  context: /test
+  upstreams:
+    - url: https://secure-backend:5443/api/v2
+    # - url: http://httpbin.org/anything
+  operations:
+    - method: GET
+      path: /info
diff --git a/gateway/examples/weather-api.yaml b/gateway/examples/weather-api.yaml
@@ -17,7 +17,7 @@
 # --------------------------------------------------------------------
 
 version: api-platform.wso2.com/v1
-kind: http/rest
+kind: RestApi
 spec:
   name: Weather-API
   version: v1.0

diff --git a/gateway/examples/websubhub.yaml b/gateway/examples/websubhub.yaml
@@ -17,10 +17,10 @@
 # --------------------------------------------------------------------
 
 version: api-platform.wso2.com/v1
-kind: async/websub
+kind: WebsubApi
 spec:
   name: WebSub-API-New-API
-  apiType: async/websub
+  apiType: WebsubApi
   version: v1.0
   context: /websubnewapi
   servers:

diff --git a/gateway/gateway-controller/README.md b/gateway/gateway-controller/README.md
@@ -241,7 +241,7 @@ POST /apis
 Content-Type: application/yaml
 
 version: api-platform.wso2.com/v1
-kind: http/rest
+kind: RestApi
 data:
   name: Weather API
   version: v1.0
@@ -295,7 +295,7 @@ PUT /apis/Weather%20API/v1.0
 Content-Type: application/yaml
 
 version: api-platform.wso2.com/v1
-kind: http/rest
+kind: RestApi
 data:
   name: Weather API
   version: v1.0
@@ -336,7 +336,7 @@ The SQLite database contains the following table:
 | `name` | TEXT | API name (indexed for fast lookups) |
 | `version` | TEXT | API version (indexed for fast lookups) |
 | `context` | TEXT | Base path (e.g., "/weather") |
-| `kind` | TEXT | API type ("http/rest", "graphql", etc.) |
+| `kind` | TEXT | API type ("RestApi", "graphql", etc.) |
 | `configuration` | TEXT | Full JSON-serialized API configuration |
 | `status` | TEXT | Deployment status ("pending", "deployed", "failed") |
 | `created_at` | TIMESTAMP | Record creation timestamp |

diff --git a/gateway/gateway-controller/api/openapi.yaml b/gateway/gateway-controller/api/openapi.yaml
@@ -70,7 +70,7 @@ paths:
               $ref: "#/components/schemas/APIConfiguration"
             example:
               version: api-platform.wso2.com/v1
-              kind: http/rest
+              kind: RestApi
               spec:
                 name: PetStore API
                 version: v1.0
@@ -116,7 +116,7 @@ paths:
               $ref: "#/components/schemas/APIConfiguration"
             example:
               version: api-platform.wso2.com/v1
-              kind: http/rest
+              kind: RestApi
               spec:
                 name: PetStore API
                 version: v1.0
@@ -1270,25 +1270,25 @@ components:
     APIConfiguration:
       type: object
       required:
-        - version
+        - apiVersion
         - kind
         - spec
       properties:
-        version:
+        apiVersion:
           type: string
           description: API specification version
           example: api-platform.wso2.com/v1
           enum:
-            - api-platform.wso2.com/v1
+            - gateway.api-platform.wso2.com/v1alpha1
         kind:
           type: string
           description: API type
-          example: http/rest
+          example: RestApi
           enum:
-            - http/rest
-            - async/websub
-            - async/websocket
-            - async/sse
+            - RestApi
+            - WebsubApi
+            - WebsocketApi
+            - SseApi
         spec:
           description: API configuration payload (REST or Async API variants)
           oneOf:
@@ -1297,8 +1297,8 @@ components:
           discriminator:
             propertyName: apiType
             mapping:
-              http/rest: '#/components/schemas/APIConfigData'
-              async/websub: '#/components/schemas/WebhookAPIData'
+              RestApi: '#/components/schemas/APIConfigData'
+              WebsubApi: '#/components/schemas/WebhookAPIData'
 
     APIConfigData:
       type: object
@@ -1320,9 +1320,9 @@ components:
         apiType:
           type: string
           description: API type
-          example: http/rest
+          example: RestApi
           enum:
-            - http/rest
+            - RestApi
         version:
           type: string
           description: Semantic version of the API
@@ -1478,9 +1478,9 @@ components:
         apiType:
           type: string
           description: API type
-          example: async/websub
+          example: WebsubApi
           enum:
-            - async/websub
+            - WebsubApi
         name:
           type: string
           description: Human-readable API name (must be URL-friendly - only letters, numbers, spaces, hyphens, underscores, and dots allowed)

diff --git a/gateway/gateway-controller/cmd/controller/main.go b/gateway/gateway-controller/cmd/controller/main.go
@@ -169,7 +169,7 @@ func main() {
 			derivedCount := 0
 			for _, apiConfig := range loadedAPIs {
 				// Derive policy configuration from API
-				if apiConfig.Configuration.Kind == "http/rest" {
+				if apiConfig.Configuration.Kind == "RestApi" {
 					storedPolicy := derivePolicyFromAPIConfig(apiConfig, &cfg.Router)
 					if storedPolicy != nil {
 						if err := policyStore.Set(storedPolicy); err != nil {

diff --git a/gateway/gateway-controller/config/config.yaml b/gateway/gateway-controller/config/config.yaml
@@ -143,7 +143,7 @@ router:
     port: 9001
 
     # Timeout for gRPC service connection (in milliseconds)
-    timeout_ms: 250
+    timeout_ms: 4250
 
     # Failure mode: false = fail closed (deny requests on error), true = fail open (allow requests on error)
     failure_mode_allow: false
@@ -160,7 +160,7 @@ router:
     request_header_mode: SEND
 
     # Message timeout for policy engine processing (in milliseconds)
-    message_timeout_ms: 250
+    message_timeout_ms: 4250
 
     # TLS configuration for policy engine connection
     tls: