wso2 · AnoshanJ · Apr 28, 2026 · Apr 28, 2026 · Apr 28, 2026 · Apr 28, 2026
diff --git a/.github/release-config.json b/.github/release-config.json
@@ -39,6 +39,6 @@
     "wso2-amp-secrets-extension",
     "wso2-amp-thunder-extension",
     "wso2-amp-evaluation-extension",
-    "wso2-amp-ai-gateway-extension"
+    "wso2-amp-api-platform-gateway-extension"
   ]
 }
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: help setup setup-colima setup-k3d setup-openchoreo setup-platform setup-console-local setup-console-local-force dev-up dev-down dev-restart dev-rebuild dev-logs dev-migrate openchoreo-up openchoreo-down openchoreo-status teardown db-connect db-logs service-logs service-shell console-logs port-forward gen-eval-artifacts
+.PHONY: help setup setup-colima setup-k3d setup-openchoreo setup-platform setup-gateway setup-console-local setup-console-local-force dev-up dev-down dev-restart dev-rebuild dev-logs dev-migrate openchoreo-up openchoreo-down openchoreo-status teardown db-connect db-logs service-logs service-shell console-logs port-forward stop-port-forward gen-eval-artifacts
 
 # Default target
 help:
@@ -10,6 +10,7 @@ help:
 	@echo "  make setup-k3d              - Create k3d cluster"
 	@echo "  make setup-openchoreo        - Install OpenChoreo on k3d"
 	@echo "  make setup-platform          - Build images and start core platform services"
+	@echo "  make setup-gateway           - Install API Platform Gateway (run via make setup)"
 	@echo "  make setup-console-local     - Install console deps (only if changed)"
 	@echo "  make setup-console-local-force - Force reinstall console deps"
 	@echo ""
@@ -19,13 +20,14 @@ help:
 	@echo "  make dev-restart             - Restart platform services"
 	@echo "  make dev-rebuild             - Rebuild images and restart services"
 	@echo "  make dev-logs                - Tail all platform logs"
-	@echo "  make dev-migrate             - Generate evaluators and run database migrations"
+	@echo "  make dev-migrate             - Generate evaluators and run database migrations (run after dev-up/setup)"
 	@echo ""
 	@echo "☸️  OpenChoreo Runtime:"
 	@echo "  make openchoreo-up      - Start OpenChoreo cluster"
 	@echo "  make openchoreo-down    - Stop OpenChoreo cluster (saves resources)"
 	@echo "  make openchoreo-status  - Check OpenChoreo cluster status"
-	@echo "  make port-forward       - Forward OpenChoreo services to localhost"
+	@echo "  make port-forward       - Stop and restart all port-forwards (interactive)"
+	@echo "  make stop-port-forward  - Stop all active port-forwards"
 	@echo ""
 	@echo "🗄️  Database:"
 	@echo "  make db-connect         - Connect to PostgreSQL"
@@ -45,17 +47,19 @@ help:
 
 # Complete setup
 setup: setup-colima setup-k3d setup-openchoreo setup-platform setup-console-local
+	@$(MAKE) dev-migrate
+	@cd deployments/scripts && ./port-forward.sh --platform --background
+	@$(MAKE) setup-gateway
+	@cd deployments/scripts && ./port-forward.sh --background
 	@echo ""
-	@echo "✅ Complete setup finished!"
+	@echo "✅ Setup complete!"
 	@echo ""
-	@echo "🌐 Access your services:"
-	@echo "   Console:   http://localhost:3000"
-	@echo "   API:       http://localhost:8080"
-	@echo "   Traces Observer Service: http://localhost:9098"
-	@echo "   Database:  localhost:5432"
+	@echo "   Console:                 http://localhost:3000"
+	@echo "   API:                     http://localhost:8080"
+	@echo "   API Platform Gateway:    http://localhost:22893"
 	@echo ""
-	@echo "📊 To access OpenChoreo services, run:"
-	@echo "   make port-forward"
+	@echo "Run 'make stop-port-forward' to stop port-forwards"
+	@echo "Run 'make port-forward' to restart in a dedicated terminal"
 
 # Setup individual components
 setup-colima:
@@ -75,6 +79,9 @@ gen-keys:
 setup-platform: gen-keys
 	@cd deployments/scripts && ./setup-platform.sh
 
+setup-gateway:
+	@cd deployments/scripts && ./setup-gateway.sh
+
 # Console local setup with dependency tracking
 # This will only rebuild when rush.json or pnpm-lock.yaml changes
 .make:
@@ -182,8 +189,18 @@ openchoreo-status:
 	@kubectl get pods -n openchoreo-system --context kind-openchoreo-local 2>/dev/null || echo "Cluster not accessible"
 
 # Port forwarding for OpenChoreo
+PLATFORM   ?=
+GATEWAY    ?=
+BACKGROUND ?=
+
 port-forward:
-	@cd deployments/scripts && ./port-forward.sh
+	@cd deployments/scripts && ./port-forward.sh \
+		$(if $(filter true,$(PLATFORM)),--platform) \
+		$(if $(filter true,$(GATEWAY)),--gateway) \
+		$(if $(filter true,$(BACKGROUND)),--background)
+
+stop-port-forward:
+	@cd deployments/scripts && ./stop-port-forward.sh
 
 # Database commands
 db-connect:

diff --git a/agent-manager-service/config/config_loader.go b/agent-manager-service/config/config_loader.go
@@ -115,7 +115,7 @@ func loadEnvs() {
 		IsTraceContentEnabled: r.readOptionalBool("OTEL_TRACELOOP_TRACE_CONTENT", true),
 
 		// OTLP Exporter configuration
-		ExporterEndpoint: r.readOptionalString("OTEL_EXPORTER_OTLP_ENDPOINT", "http://obs-gateway-gateway-gateway-runtime.openchoreo-data-plane.svc.cluster.local:22893/otel"),
+		ExporterEndpoint: r.readOptionalString("OTEL_EXPORTER_OTLP_ENDPOINT", "http://api-platform-default-default-gateway-gateway-runtime.openchoreo-data-plane.svc.cluster.local:22893/otel"),
 	}
 
 	// Observer service configuration - temporarily use localhost for agent-manager-service to access observer service

diff --git a/console/workspaces/pages/gateways/src/AddAIGateway.Organization.tsx b/console/workspaces/pages/gateways/src/AddAIGateway.Organization.tsx
@@ -122,17 +122,17 @@ export const AddAIGatewayOrganization: React.FC = () => {
         },
         onError: (e: unknown) => {
           // eslint-disable-next-line no-console
-          console.error("Failed to create AI gateway:", e);
+          console.error("Failed to create gateway:", e);
         },
       }
     );
   }, [formData, validateForm, createGateway, navigate, orgId]);
 
   return (
     <PageLayout
-      title="Add AI Gateway"
+      title="Add Gateway"
       backHref={backHref}
-      backLabel="Back to AI Gateways"
+      backLabel="Back to Gateways"
       disableIcon
     >
       <Form.Stack spacing={2}>
@@ -159,7 +159,7 @@ export const AddAIGatewayOrganization: React.FC = () => {
           <Alert severity="error" sx={{ mt: 2 }}>
             {createError instanceof Error
               ? createError.message
-              : "Failed to create AI gateway"}
+              : "Failed to create gateway"}
           </Alert>
         )}
 

diff --git a/console/workspaces/pages/gateways/src/Gateways.Organization.tsx b/console/workspaces/pages/gateways/src/Gateways.Organization.tsx
@@ -56,7 +56,7 @@ export const GatewaysOrganization: React.FC = () => {
         <Route
           index
           element={
-            <PageLayout title="AI Gateways" disableIcon>
+            <PageLayout title="Gateways" disableIcon>
               <AIGatewaysTable onEditGateway={handleEditGateway} />
             </PageLayout>
           }

diff --git a/console/workspaces/pages/gateways/src/index.ts b/console/workspaces/pages/gateways/src/index.ts
@@ -19,8 +19,8 @@ import { DoorClosedLocked } from "@wso2/oxygen-ui-icons-react";
 import { GatewaysOrganization } from "./Gateways.Organization";
 
 export const metaData = {
-  title: "AI Gateways",
-  description: "A page component for AI Gateway management",
+  title: "Gateways",
+  description: "A page component for Gateway management",
   icon: DoorClosedLocked,
   path: "/gateways",
   component: GatewaysOrganization,

diff --git a/console/workspaces/pages/gateways/src/subComponents/AIGatewaysTable.tsx b/console/workspaces/pages/gateways/src/subComponents/AIGatewaysTable.tsx
@@ -70,7 +70,7 @@ export function AIGatewaysTable({ onEditGateway }: AIGatewaysTableProps) {
     isLoading,
     error,
     refetch,
-  } = useListGateways({ orgName: orgId }, { type: "AI" });
+  } = useListGateways({ orgName: orgId });
 
   const { mutateAsync: deleteGateway } = useDeleteGateway();
 
@@ -101,7 +101,7 @@ export function AIGatewaysTable({ onEditGateway }: AIGatewaysTableProps) {
       <Box flexGrow={1}>
         <SearchBar
           key="search-bar"
-          placeholder="Search AI Gateways..."
+          placeholder="Search Gateways..."
           size="small"
           fullWidth
           value={searchQuery}
@@ -122,7 +122,7 @@ export function AIGatewaysTable({ onEditGateway }: AIGatewaysTableProps) {
           color="primary"
           startIcon={<Plus size={16} />}
         >
-          Add AI Gateway
+          Add Gateway
         </Button>
       )}
     </Stack>
@@ -204,8 +204,8 @@ export function AIGatewaysTable({ onEditGateway }: AIGatewaysTableProps) {
         <ListingTable.Container>
           <ListingTable.EmptyState
             illustration={<DoorClosedLocked size={64} />}
-            title="No available AI gateway"
-            description="Add an AI gateway to manage and monitor your AI gateway deployments."
+            title="No available gateway"
+            description="Add a gateway to manage and monitor your gateway deployments."
             action={
               <Button
                 component={Link}
@@ -217,7 +217,7 @@ export function AIGatewaysTable({ onEditGateway }: AIGatewaysTableProps) {
                 variant="contained"
                 startIcon={<Plus size={16} />}
               >
-                Add AI Gateway
+                Add Gateway
               </Button>
             }
           />
@@ -233,7 +233,7 @@ export function AIGatewaysTable({ onEditGateway }: AIGatewaysTableProps) {
         <ListingTable.Container>
           <ListingTable.EmptyState
             illustration={<Search size={64} />}
-            title="No AI Gateways found."
+            title="No Gateways found."
             description="Try a different keyword or clear the search filter."
           />
         </ListingTable.Container>
@@ -255,6 +255,9 @@ export function AIGatewaysTable({ onEditGateway }: AIGatewaysTableProps) {
             <ListingTable.Head>
               <ListingTable.Row>
                 <ListingTable.Cell width="300px">Name</ListingTable.Cell>
+                <ListingTable.Cell align="center" width="120px">
+                  Type
+                </ListingTable.Cell>
                 <ListingTable.Cell align="center" width="120px">
                   Status
                 </ListingTable.Cell>
@@ -336,6 +339,15 @@ export function AIGatewaysTable({ onEditGateway }: AIGatewaysTableProps) {
                       </Stack>
                     </ListingTable.Cell>
 
+                    <ListingTable.Cell align="center">
+                      <Chip
+                        label={gateway.gatewayType === "AI" ? "AI" : "Regular"}
+                        size="small"
+                        variant="outlined"
+                        color={gateway.gatewayType === "AI" ? "info" : "default"}
+                      />
+                    </ListingTable.Cell>
+
                     <ListingTable.Cell align="center">
                       <Chip
                         label={isActive ? "Active" : "Inactive"}
@@ -374,7 +386,7 @@ export function AIGatewaysTable({ onEditGateway }: AIGatewaysTableProps) {
                                 size="small"
                                 onClick={() =>
                                   addConfirmation({
-                                    title: "Delete AI Gateway",
+                                    title: "Delete Gateway",
                                     description: `Are you sure you want to delete ${displayName}?`,
                                     confirmButtonText: "Delete",
                                     confirmButtonColor: "error",

diff --git a/console/workspaces/pages/gateways/src/subComponents/AddAIGatewayForm.tsx b/console/workspaces/pages/gateways/src/subComponents/AddAIGatewayForm.tsx
@@ -113,7 +113,7 @@ export const AddAIGatewayForm: React.FC<AddAIGatewayFormProps> = ({
           <Form.ElementWrapper label="Name" name="displayName">
             <TextField
               id="displayName"
-              placeholder="e.g., Production AI Gateway"
+              placeholder="e.g., Production Gateway"
               value={formData.displayName}
               onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
                 handleFieldChange("displayName", e.target.value)

diff --git a/console/workspaces/pages/gateways/src/subComponents/EditGatewayDrawer.tsx b/console/workspaces/pages/gateways/src/subComponents/EditGatewayDrawer.tsx
@@ -152,7 +152,7 @@ export function EditGatewayDrawer({
     <DrawerWrapper open={open} onClose={onClose}>
       <DrawerHeader
         icon={<Edit size={24} />}
-        title="Edit AI Gateway"
+        title="Edit Gateway"
         onClose={onClose}
       />
       <DrawerContent>
@@ -184,7 +184,7 @@ export function EditGatewayDrawer({
                     onChange={(e) =>
                       handleFieldChange("displayName", e.target.value)
                     }
-                    placeholder="e.g., Production AI Gateway"
+                    placeholder="e.g., Production Gateway"
                     error={Boolean(errors.displayName)}
                     helperText={errors.displayName}
                     disabled={isPending}

diff --git a/console/workspaces/pages/gateways/src/subComponents/ViewGateway.tsx b/console/workspaces/pages/gateways/src/subComponents/ViewGateway.tsx
@@ -130,7 +130,7 @@ export const ViewGateway: React.FC = () => {
           absoluteRouteMap.children.org.children.gateways.path,
           { orgId: orgId ?? "" },
         )}
-        backLabel="Back to AI Gateways"
+        backLabel="Back to Gateways"
         description={
           gateway?.createdAt
             ? `Created ${formatDistanceToNow(new Date(gateway.createdAt), {
@@ -230,6 +230,26 @@ export const ViewGateway: React.FC = () => {
                   </Stack>
                 </Card>
               </Grid>
+              <Grid size={{ xs: 12, sm: 6, md: 4 }}>
+                <Card variant="outlined" sx={{ p: 2, height: "100%" }}>
+                  <Stack spacing={0.5}>
+                    <Typography
+                      variant="caption"
+                      color="text.secondary"
+                      sx={{ fontWeight: 500 }}
+                    >
+                      Type
+                    </Typography>
+                    <Chip
+                      label={gateway.gatewayType?.toUpperCase() === "AI" ? "AI" : "Regular"}
+                      size="small"
+                      variant="outlined"
+                      color={gateway.gatewayType?.toUpperCase() === "AI" ? "info" : "default"}
+                      sx={{ width: "fit-content" }}
+                    />
+                  </Stack>
+                </Card>
+              </Grid>
               <Grid size={{ xs: 12, sm: 6, md: 4 }}>
                 <Card variant="outlined" sx={{ p: 2, height: "100%" }}>
                   <Stack spacing={0.5}>

diff --git a/deployments/docker-compose.yml b/deployments/docker-compose.yml
@@ -101,8 +101,8 @@ services:
       - "api.openchoreo.localhost:host-gateway"
       # Thunder IDP for OAuth2 token exchange (must match OpenChoreo's security.oidc config)
       - "thunder.amp.localhost:host-gateway"
-      # AI Gateway runtime for agent endpoint access (port 8084 mapped via k3d)
-      - "ai-gateway.amp.localhost:host-gateway"
+      # API Platform Gateway runtime for agent endpoint access
+      - "api-platform-gateway.amp.localhost:host-gateway"
 
   # Agent Manager Console (React Frontend)
   agent-manager-console:

diff --git a/deployments/helm-charts/wso2-agent-manager/values.yaml b/deployments/helm-charts/wso2-agent-manager/values.yaml
@@ -124,7 +124,7 @@ agentManagerService:
     # OpenTelemetry configuration
     otel:
       traceContent: "true"
-      exporterEndpoint: "http://obs-gateway-gateway-gateway-runtime.openchoreo-data-plane.svc.cluster.local:22893/otel"
+      exporterEndpoint: "http://api-platform-default-default-gateway-gateway-runtime.openchoreo-data-plane.svc.cluster.local:22893/otel"
 
     # Key Manager configuration
     keyManager:

diff --git a/.../wso2-amp-ai-gateway-extension/Chart.yaml → ...api-platform-gateway-extension/Chart.yaml b/.../wso2-amp-ai-gateway-extension/Chart.yaml → ...api-platform-gateway-extension/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-name: wso2-amp-ai-gateway-extension
-description: A Helm chart to deploy and auto-register the WSO2 AI API Gateway for the Agent Management Platform.
+name: wso2-amp-api-platform-gateway-extension
+description: A Helm chart to deploy and auto-register the unified API Platform Gateway for the Agent Management Platform.
 type: application
 version: 0.0.0-dev
 appVersion: "0.0.0-dev"

diff --git a/...-gateway-extension/templates/_helpers.tpl → ...-gateway-extension/templates/_helpers.tpl b/...-gateway-extension/templates/_helpers.tpl → ...-gateway-extension/templates/_helpers.tpl
@@ -51,13 +51,13 @@ Defaults to "<release-name>-config" when not explicitly set.
 
 {{/*
 Name of the APIGateway CR.
-Defaults to the release name when gateway.name is not explicitly set.
+Defaults to "api-platform-<orgName>-<environment>" when gateway.name is not explicitly set.
 */}}
 {{- define "wso2-amp-gateway-extension.apiGatewayName" -}}
 {{- if .Values.gateway.name }}
 {{- .Values.gateway.name }}
 {{- else }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- printf "api-platform-%s-%s" .Values.agentManager.orgName .Values.gateway.environment | lower | trunc 63 | trimSuffix "-" }}
 {{- end }}
 {{- end }}
 
@@ -78,7 +78,7 @@ Resolve the IDP client ID from secret or direct value
   valueFrom:
     secretKeyRef:
       name: {{ .Values.agentManager.idp.existingSecret }}
-      key: {{ .Values.agentManager.idp.existingSecretClientIdKey }}
+      key: {{ required "agentManager.idp.existingSecretClientIdKey is required when using existingSecret" .Values.agentManager.idp.existingSecretClientIdKey }}
 {{- else }}
 - name: IDP_CLIENT_ID
   value: {{ .Values.agentManager.idp.clientId | quote }}
@@ -94,7 +94,7 @@ Resolve the IDP client secret from secret or direct value
   valueFrom:
     secretKeyRef:
       name: {{ .Values.agentManager.idp.existingSecret }}
-      key: {{ .Values.agentManager.idp.existingSecretClientSecretKey }}
+      key: {{ required "agentManager.idp.existingSecretClientSecretKey is required when using existingSecret" .Values.agentManager.idp.existingSecretClientSecretKey }}
 {{- else }}
 - name: IDP_CLIENT_SECRET
   value: {{ .Values.agentManager.idp.clientSecret | quote }}