diff --git a/services/am-analysis/argocd.yaml b/services/am-analysis/argocd.yaml
new file mode 100644
index 000000000..06c554cc0
--- /dev/null
+++ b/services/am-analysis/argocd.yaml
@@ -0,0 +1,21 @@
+apiVersion: am.argocd/v1
+kind: ServiceDeploy
+service: am-analysis
+enabled: true
+owners: core
+source:
+  repo: am-core-services
+  path: services/am-analysis/argocd.yaml
+chart:
+  repoURL: https://github.com/AM-Portfolio/am-pipelines.git
+  path: helm/universal-chart
+  targetRevision: main
+helm:
+  releaseName: am-analysis
+  valuesPath: services/am-analysis/helm
+valuesRepoURL: https://github.com/AM-Portfolio/am-core-services.git
+valuesTargetRevision: main
+envs:
+  prod:
+    enabled: true
+    namespace: am-apps-prod
diff --git a/services/am-analysis/docs/diagrams/am-analysis-architecture.drawio b/services/am-analysis/docs/diagrams/am-analysis-architecture.drawio
index 2f71db96f..38046e42d 100644
--- a/services/am-analysis/docs/diagrams/am-analysis-architecture.drawio
+++ b/services/am-analysis/docs/diagrams/am-analysis-architecture.drawio
@@ -1,6 +1,6 @@
 <mxfile host="65bd71144e">
     <diagram id="components" name="01 Components Map">
-        <mxGraphModel grid="1" page="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" pageScale="1" pageWidth="1200" pageHeight="1600" background="#ffffff" math="0" shadow="0">
+        <mxGraphModel dx="888" dy="412" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1200" pageHeight="1600" background="#ffffff" math="0" shadow="0">
             <root>
                 <mxCell id="0"/>
                 <mxCell id="1" parent="0"/>
@@ -107,7 +107,7 @@
         </mxGraphModel>
     </diagram>
     <diagram id="flow-a" name="02 Flow A HTTP">
-        <mxGraphModel dx="988" dy="468" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="900" pageHeight="1400" background="#ffffff" math="0" shadow="0">
+        <mxGraphModel dx="888" dy="412" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="900" pageHeight="1400" background="#ffffff" math="0" shadow="0">
             <root>
                 <mxCell id="0"/>
                 <mxCell id="1" parent="0"/>
@@ -160,7 +160,7 @@
         </mxGraphModel>
     </diagram>
     <diagram id="flow-b" name="03 Flow B Dashboard">
-        <mxGraphModel dx="988" dy="468" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="900" pageHeight="1400" background="#ffffff" math="0" shadow="0">
+        <mxGraphModel dx="888" dy="95" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="900" pageHeight="1400" background="#ffffff" math="0" shadow="0">
             <root>
                 <mxCell id="0"/>
                 <mxCell id="1" parent="0"/>
@@ -213,7 +213,7 @@
         </mxGraphModel>
     </diagram>
     <diagram id="flow-c" name="04 Flow C Bootstrap">
-        <mxGraphModel dx="706" dy="334" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="900" pageHeight="1600" background="#ffffff" math="0" shadow="0">
+        <mxGraphModel dx="634" dy="68" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="900" pageHeight="1600" background="#ffffff" math="0" shadow="0">
             <root>
                 <mxCell id="0"/>
                 <mxCell id="1" parent="0"/>
@@ -278,7 +278,7 @@
         </mxGraphModel>
     </diagram>
     <diagram id="flow-d" name="05 Flow D Ingest">
-        <mxGraphModel dx="988" dy="468" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="900" pageHeight="1200" background="#ffffff" math="0" shadow="0">
+        <mxGraphModel dx="888" dy="95" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="900" pageHeight="1200" background="#ffffff" math="0" shadow="0">
             <root>
                 <mxCell id="0"/>
                 <mxCell id="1" parent="0"/>
@@ -319,7 +319,7 @@
         </mxGraphModel>
     </diagram>
     <diagram id="flow-e" name="06 Flow E Market Tick">
-        <mxGraphModel dx="1098" dy="520" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1100" pageHeight="2200" background="#ffffff" math="0" shadow="0">
+        <mxGraphModel dx="987" dy="106" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1100" pageHeight="2200" background="#ffffff" math="0" shadow="0">
             <root>
                 <mxCell id="0"/>
                 <mxCell id="1" parent="0"/>
@@ -448,7 +448,7 @@
         </mxGraphModel>
     </diagram>
     <diagram id="kafka-detail" name="07 Kafka Detail">
-        <mxGraphModel dx="988" dy="468" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1100" pageHeight="1400" background="#ffffff" math="0" shadow="0">
+        <mxGraphModel dx="888" dy="412" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1100" pageHeight="1400" background="#ffffff" math="0" shadow="0">
             <root>
                 <mxCell id="0"/>
                 <mxCell id="1" parent="0"/>
diff --git a/services/am-analysis/helm/values.prod.yaml b/services/am-analysis/helm/values.prod.yaml
index c9bcdda31..fe191079c 100644
--- a/services/am-analysis/helm/values.prod.yaml
+++ b/services/am-analysis/helm/values.prod.yaml
@@ -37,7 +37,7 @@ ingress:
         - path: /analysis
           pathType: Prefix
 
-# Vault enabled — injects all secrets at runtime
+# Vault enabled - injects all secrets at runtime
 vault:
   enabled: true
   role: "am-backend-role"
diff --git a/services/am-gateway/argocd.yaml b/services/am-gateway/argocd.yaml
new file mode 100644
index 000000000..42bb6f4da
--- /dev/null
+++ b/services/am-gateway/argocd.yaml
@@ -0,0 +1,21 @@
+apiVersion: am.argocd/v1
+kind: ServiceDeploy
+service: am-gateway
+enabled: true
+owners: core
+source:
+  repo: am-core-services
+  path: services/am-gateway/argocd.yaml
+chart:
+  repoURL: https://github.com/AM-Portfolio/am-pipelines.git
+  path: helm/universal-chart
+  targetRevision: main
+helm:
+  releaseName: am-gateway
+  valuesPath: services/am-gateway/helm
+valuesRepoURL: https://github.com/AM-Portfolio/am-core-services.git
+valuesTargetRevision: main
+envs:
+  prod:
+    enabled: true
+    namespace: am-apps-prod
diff --git a/services/am-gateway/helm/values.prod.yaml b/services/am-gateway/helm/values.prod.yaml
index 3b491f53a..32f1a09ff 100644
--- a/services/am-gateway/helm/values.prod.yaml
+++ b/services/am-gateway/helm/values.prod.yaml
@@ -20,7 +20,7 @@ probes:
   readiness:
     path: "/actuator/health"
 
-# Vault enabled — role and token management now handled centrally
+# Vault enabled - role and token management now handled centrally
 vault:
   enabled: true
   secretPaths:
diff --git a/services/am-mcp-server/argocd.yaml b/services/am-mcp-server/argocd.yaml
new file mode 100644
index 000000000..1a00f47f0
--- /dev/null
+++ b/services/am-mcp-server/argocd.yaml
@@ -0,0 +1,21 @@
+apiVersion: am.argocd/v1
+kind: ServiceDeploy
+service: am-mcp-server
+enabled: true
+owners: core
+source:
+  repo: am-core-services
+  path: services/am-mcp-server/argocd.yaml
+chart:
+  repoURL: https://github.com/AM-Portfolio/am-pipelines.git
+  path: helm/universal-chart
+  targetRevision: main
+helm:
+  releaseName: am-mcp-server
+  valuesPath: services/am-mcp-server/helm
+valuesRepoURL: https://github.com/AM-Portfolio/am-core-services.git
+valuesTargetRevision: main
+envs:
+  prod:
+    enabled: true
+    namespace: am-apps-prod
diff --git a/services/am-mcp-server/helm/values.dev.yaml b/services/am-mcp-server/helm/values.dev.yaml
index 3563f2bb1..ac4896425 100644
--- a/services/am-mcp-server/helm/values.dev.yaml
+++ b/services/am-mcp-server/helm/values.dev.yaml
@@ -52,11 +52,16 @@ ingress:
   annotations:
     kubernetes.io/ingress.class: "traefik"
     traefik.ingress.kubernetes.io/router.entrypoints: web,websecure
+    traefik.ingress.kubernetes.io/router.priority: "200"
     traefik.ingress.kubernetes.io/router.middlewares: >-
       am-apps-dev-dev-global-cors@kubernetescrd,
       am-apps-dev-dev-strip-prefix@kubernetescrd
   hosts:
     - host: am-dev.asrax.in
       paths:
+        # Strip /mcp -> /sse. SSE endpoint event announces /message (absolute),
+        # so also route /message to this service (strip is a no-op for that path).
         - path: /mcp
           pathType: Prefix
+        - path: /message
+          pathType: Prefix
diff --git a/services/am-mcp-server/helm/values.prod.yaml b/services/am-mcp-server/helm/values.prod.yaml
index d94315baf..fe888c42e 100644
--- a/services/am-mcp-server/helm/values.prod.yaml
+++ b/services/am-mcp-server/helm/values.prod.yaml
@@ -12,7 +12,7 @@ resources:
     cpu: 250m
     memory: 256Mi
 
-# Vault enabled — injects auth credentials at runtime
+# Vault enabled - injects auth credentials at runtime
 vault:
   enabled: true
   role: "am-backend-role"