diff --git a/specs/007-observability-lgtm-compose/generation/patches/0001-state-overlay.patch b/specs/007-observability-lgtm-compose/generation/patches/0001-state-overlay.patch
index b1c3d9afc..0b200e7cc 100644
--- a/specs/007-observability-lgtm-compose/generation/patches/0001-state-overlay.patch
+++ b/specs/007-observability-lgtm-compose/generation/patches/0001-state-overlay.patch
@@ -1755,12 +1755,11 @@ index 0000000..ddd3733
 +      - targets:
 +          - http://ingress:8080/health
 +          - http://ingress:8080/
-+          - http://database:18084/
 +          - http://reference-data:18085/stocks
 +          - http://account-service:18088/account/22214
 +          - http://people-service:18089/swagger
 +          - http://position-service:18090/health/alive
-+          - http://trade-processor:18091/health
++          - http://trade-processor:18091/system/health
 +          - http://trade-service:18092/v3/api-docs
 +          - http://web-front-end-angular:18093/
 +          - http://trade-feed:18086/
diff --git a/specs/008-pricing-awareness-market-data/generation/patches/0001-state-overlay.patch b/specs/008-pricing-awareness-market-data/generation/patches/0001-state-overlay.patch
index 08fea9881..248f36b25 100644
--- a/specs/008-pricing-awareness-market-data/generation/patches/0001-state-overlay.patch
+++ b/specs/008-pricing-awareness-market-data/generation/patches/0001-state-overlay.patch
@@ -3256,12 +3256,11 @@ index 0000000..1ae9556
 +      - targets:
 +          - http://ingress:8080/health
 +          - http://ingress:8080/
-+          - http://database:18084/
 +          - http://reference-data:18085/stocks
 +          - http://account-service:18088/account/22214
 +          - http://people-service:18089/swagger
 +          - http://position-service:18090/health/alive
-+          - http://trade-processor:18091/health
++          - http://trade-processor:18091/system/health
 +          - http://trade-service:18092/v3/api-docs
 +          - http://web-front-end-angular:18093/
 +          - http://price-publisher:18100/health
diff --git a/specs/009-order-management-matcher/generation/patches/0001-state-overlay.patch b/specs/009-order-management-matcher/generation/patches/0001-state-overlay.patch
index be986a6a1..3b8b99ae7 100644
--- a/specs/009-order-management-matcher/generation/patches/0001-state-overlay.patch
+++ b/specs/009-order-management-matcher/generation/patches/0001-state-overlay.patch
@@ -1332,7 +1332,7 @@ index 0000000..c3cd057
 +    {"id": 2, "type": "stat", "title": "NATS Monitor Health", "datasource": { "type": "prometheus", "uid": "prometheus" }, "gridPos": { "h": 4, "w": 6, "x": 6, "y": 0 }, "targets": [{ "refId": "A", "expr": "max(probe_success{job=\"traderx-http-probe\",instance=\"http://nats-broker:8222/varz\"})" }], "fieldConfig": {"defaults": {"min": 0, "max": 1, "thresholds": {"mode": "absolute", "steps": [{"color": "red", "value": null}, {"color": "green", "value": 1}]}}}},
 +    {"id": 3, "type": "stat", "title": "Pricing Endpoint p95 (5m)", "datasource": { "type": "prometheus", "uid": "prometheus" }, "gridPos": { "h": 4, "w": 6, "x": 12, "y": 0 }, "targets": [{ "refId": "A", "expr": "quantile_over_time(0.95, probe_duration_seconds{job=\"traderx-http-probe\",instance=\"http://price-publisher:18100/prices/IBM\"}[5m])" }], "fieldConfig": {"defaults": {"unit": "s", "decimals": 3}}},
 +    {"id": 4, "type": "stat", "title": "Trade API p95 (5m)", "datasource": { "type": "prometheus", "uid": "prometheus" }, "gridPos": { "h": 4, "w": 6, "x": 18, "y": 0 }, "targets": [{ "refId": "A", "expr": "quantile_over_time(0.95, probe_duration_seconds{job=\"traderx-http-probe\",instance=\"http://trade-service:18092/v3/api-docs\"}[5m])" }], "fieldConfig": {"defaults": {"unit": "s", "decimals": 3}}},
-+    {"id": 5, "type": "timeseries", "title": "Pricing + Trade Endpoints Success", "datasource": { "type": "prometheus", "uid": "prometheus" }, "gridPos": { "h": 8, "w": 12, "x": 0, "y": 4 }, "targets": [{ "refId": "A", "expr": "probe_success{job=\"traderx-http-probe\",instance=~\"http://price-publisher:18100/.*|http://trade-service:18092/.*|http://trade-processor:18091/health\"}" }], "fieldConfig": {"defaults": {"min": 0, "max": 1}}, "options": {"legend": {"displayMode": "table", "placement": "bottom"}}},
++    {"id": 5, "type": "timeseries", "title": "Pricing + Trade Endpoints Success", "datasource": { "type": "prometheus", "uid": "prometheus" }, "gridPos": { "h": 8, "w": 12, "x": 0, "y": 4 }, "targets": [{ "refId": "A", "expr": "probe_success{job=\"traderx-http-probe\",instance=~\"http://price-publisher:18100/.*|http://trade-service:18092/.*|http://trade-processor:18091/system/health\"}" }], "fieldConfig": {"defaults": {"min": 0, "max": 1}}, "options": {"legend": {"displayMode": "table", "placement": "bottom"}}},
 +    {"id": 6, "type": "timeseries", "title": "Pricing Pipeline Log Throughput", "datasource": { "type": "loki", "uid": "loki" }, "gridPos": { "h": 8, "w": 12, "x": 12, "y": 4 }, "targets": [{ "refId": "A", "expr": "sum by (service) (rate({compose_project=\"traderx-state-009\",service=~\"price-publisher|trade-service|trade-processor|position-service\"}[1m]))" }], "fieldConfig": {"defaults": {"unit": "lines/s"}}, "options": {"legend": {"displayMode": "table", "placement": "bottom"}}},
 +    {"id": 7, "type": "logs", "title": "Pipeline Logs (Price / Trade / Position)", "datasource": { "type": "loki", "uid": "loki" }, "gridPos": { "h": 10, "w": 24, "x": 0, "y": 12 }, "targets": [{ "refId": "A", "expr": "{compose_project=\"traderx-state-009\",service=~\"price-publisher|trade-service|trade-processor|position-service\"}" }], "options": {"showLabels": true, "showTime": true, "wrapLogMessage": true, "enableLogDetails": true}}
 +  ]
@@ -2003,14 +2003,13 @@ index 0000000..fa60a9f
 +      - targets:
 +          - http://ingress:8080/health
 +          - http://ingress:8080/
-+          - http://database:18084/
 +          - http://reference-data:18085/stocks
 +          - http://price-publisher:18100/health
 +          - http://price-publisher:18100/prices/IBM
 +          - http://account-service:18088/account/22214
 +          - http://people-service:18089/swagger
 +          - http://position-service:18090/health/alive
-+          - http://trade-processor:18091/health
++          - http://trade-processor:18091/system/health
 +          - http://trade-service:18092/v3/api-docs
 +          - http://web-front-end-angular:18093/
 +          - http://nats-broker:8222/varz
diff --git a/specs/010-kubernetes-runtime/generation/patches/0001-state-overlay.patch b/specs/010-kubernetes-runtime/generation/patches/0001-state-overlay.patch
index 54ec7ba2c..20000a47c 100644
--- a/specs/010-kubernetes-runtime/generation/patches/0001-state-overlay.patch
+++ b/specs/010-kubernetes-runtime/generation/patches/0001-state-overlay.patch
@@ -1892,7 +1892,7 @@ index 0000000..7b87e12
 +        {"id": 2, "type": "stat", "title": "NATS Monitor Health", "datasource": { "type": "prometheus", "uid": "prometheus" }, "gridPos": { "h": 4, "w": 6, "x": 6, "y": 0 }, "targets": [{ "refId": "A", "expr": "max(probe_success{job=\"traderx-http-probe\",instance=\"http://nats-broker:8222/varz\"})" }], "fieldConfig": {"defaults": {"min": 0, "max": 1, "thresholds": {"mode": "absolute", "steps": [{"color": "red", "value": null}, {"color": "green", "value": 1}]}}}},
 +        {"id": 3, "type": "stat", "title": "Pricing Endpoint p95 (5m)", "datasource": { "type": "prometheus", "uid": "prometheus" }, "gridPos": { "h": 4, "w": 6, "x": 12, "y": 0 }, "targets": [{ "refId": "A", "expr": "quantile_over_time(0.95, probe_duration_seconds{job=\"traderx-http-probe\",instance=\"http://price-publisher:18100/prices/IBM\"}[5m])" }], "fieldConfig": {"defaults": {"unit": "s", "decimals": 3}}},
 +        {"id": 4, "type": "stat", "title": "Trade API p95 (5m)", "datasource": { "type": "prometheus", "uid": "prometheus" }, "gridPos": { "h": 4, "w": 6, "x": 18, "y": 0 }, "targets": [{ "refId": "A", "expr": "quantile_over_time(0.95, probe_duration_seconds{job=\"traderx-http-probe\",instance=\"http://trade-service:18092/v3/api-docs\"}[5m])" }], "fieldConfig": {"defaults": {"unit": "s", "decimals": 3}}},
-+        {"id": 5, "type": "timeseries", "title": "Pricing + Trade Endpoints Success", "datasource": { "type": "prometheus", "uid": "prometheus" }, "gridPos": { "h": 8, "w": 12, "x": 0, "y": 4 }, "targets": [{ "refId": "A", "expr": "probe_success{job=\"traderx-http-probe\",instance=~\"http://price-publisher:18100/.*|http://trade-service:18092/.*|http://trade-processor:18091/health\"}" }], "fieldConfig": {"defaults": {"min": 0, "max": 1}}, "options": {"legend": {"displayMode": "table", "placement": "bottom"}}},
++        {"id": 5, "type": "timeseries", "title": "Pricing + Trade Endpoints Success", "datasource": { "type": "prometheus", "uid": "prometheus" }, "gridPos": { "h": 8, "w": 12, "x": 0, "y": 4 }, "targets": [{ "refId": "A", "expr": "probe_success{job=\"traderx-http-probe\",instance=~\"http://price-publisher:18100/.*|http://trade-service:18092/.*|http://trade-processor:18091/system/health\"}" }], "fieldConfig": {"defaults": {"min": 0, "max": 1}}, "options": {"legend": {"displayMode": "table", "placement": "bottom"}}},
 +        {"id": 6, "type": "timeseries", "title": "Pricing Pipeline Log Throughput", "datasource": { "type": "loki", "uid": "loki" }, "gridPos": { "h": 8, "w": 12, "x": 12, "y": 4 }, "targets": [{ "refId": "A", "expr": "sum by (service) (rate({compose_project=\"traderx-state-009\",service=~\"price-publisher|trade-service|trade-processor|position-service\"}[1m]))" }], "fieldConfig": {"defaults": {"unit": "lines/s"}}, "options": {"legend": {"displayMode": "table", "placement": "bottom"}}},
 +        {"id": 7, "type": "logs", "title": "Pipeline Logs (Price / Trade / Position)", "datasource": { "type": "loki", "uid": "loki" }, "gridPos": { "h": 10, "w": 24, "x": 0, "y": 12 }, "targets": [{ "refId": "A", "expr": "{compose_project=\"traderx-state-009\",service=~\"price-publisher|trade-service|trade-processor|position-service\"}" }], "options": {"showLabels": true, "showTime": true, "wrapLogMessage": true, "enableLogDetails": true}}
 +      ]
@@ -2560,14 +2560,13 @@ index 0000000..79c96d3
 +          - targets:
 +              - http://edge-proxy:8080/health
 +              - http://edge-proxy:8080/
-+              - http://database:18084/
 +              - http://reference-data:18085/stocks
 +              - http://price-publisher:18100/health
 +              - http://price-publisher:18100/prices/IBM
 +              - http://account-service:18088/account/22214
 +              - http://people-service:18089/swagger
 +              - http://position-service:18090/health/alive
-+              - http://trade-processor:18091/health
++              - http://trade-processor:18091/system/health
 +              - http://trade-service:18092/v3/api-docs
 +              - http://web-front-end-angular:18093/
 +              - http://nats-broker:8222/varz
diff --git a/specs/011-tilt-kubernetes-dev-loop/generation/patches/0001-state-overlay.patch b/specs/011-tilt-kubernetes-dev-loop/generation/patches/0001-state-overlay.patch
index 0c20b34c0..b7cb1ac24 100644
--- a/specs/011-tilt-kubernetes-dev-loop/generation/patches/0001-state-overlay.patch
+++ b/specs/011-tilt-kubernetes-dev-loop/generation/patches/0001-state-overlay.patch
@@ -1973,7 +1973,7 @@ index 0000000..7b87e12
 +        {"id": 2, "type": "stat", "title": "NATS Monitor Health", "datasource": { "type": "prometheus", "uid": "prometheus" }, "gridPos": { "h": 4, "w": 6, "x": 6, "y": 0 }, "targets": [{ "refId": "A", "expr": "max(probe_success{job=\"traderx-http-probe\",instance=\"http://nats-broker:8222/varz\"})" }], "fieldConfig": {"defaults": {"min": 0, "max": 1, "thresholds": {"mode": "absolute", "steps": [{"color": "red", "value": null}, {"color": "green", "value": 1}]}}}},
 +        {"id": 3, "type": "stat", "title": "Pricing Endpoint p95 (5m)", "datasource": { "type": "prometheus", "uid": "prometheus" }, "gridPos": { "h": 4, "w": 6, "x": 12, "y": 0 }, "targets": [{ "refId": "A", "expr": "quantile_over_time(0.95, probe_duration_seconds{job=\"traderx-http-probe\",instance=\"http://price-publisher:18100/prices/IBM\"}[5m])" }], "fieldConfig": {"defaults": {"unit": "s", "decimals": 3}}},
 +        {"id": 4, "type": "stat", "title": "Trade API p95 (5m)", "datasource": { "type": "prometheus", "uid": "prometheus" }, "gridPos": { "h": 4, "w": 6, "x": 18, "y": 0 }, "targets": [{ "refId": "A", "expr": "quantile_over_time(0.95, probe_duration_seconds{job=\"traderx-http-probe\",instance=\"http://trade-service:18092/v3/api-docs\"}[5m])" }], "fieldConfig": {"defaults": {"unit": "s", "decimals": 3}}},
-+        {"id": 5, "type": "timeseries", "title": "Pricing + Trade Endpoints Success", "datasource": { "type": "prometheus", "uid": "prometheus" }, "gridPos": { "h": 8, "w": 12, "x": 0, "y": 4 }, "targets": [{ "refId": "A", "expr": "probe_success{job=\"traderx-http-probe\",instance=~\"http://price-publisher:18100/.*|http://trade-service:18092/.*|http://trade-processor:18091/health\"}" }], "fieldConfig": {"defaults": {"min": 0, "max": 1}}, "options": {"legend": {"displayMode": "table", "placement": "bottom"}}},
++        {"id": 5, "type": "timeseries", "title": "Pricing + Trade Endpoints Success", "datasource": { "type": "prometheus", "uid": "prometheus" }, "gridPos": { "h": 8, "w": 12, "x": 0, "y": 4 }, "targets": [{ "refId": "A", "expr": "probe_success{job=\"traderx-http-probe\",instance=~\"http://price-publisher:18100/.*|http://trade-service:18092/.*|http://trade-processor:18091/system/health\"}" }], "fieldConfig": {"defaults": {"min": 0, "max": 1}}, "options": {"legend": {"displayMode": "table", "placement": "bottom"}}},
 +        {"id": 6, "type": "timeseries", "title": "Pricing Pipeline Log Throughput", "datasource": { "type": "loki", "uid": "loki" }, "gridPos": { "h": 8, "w": 12, "x": 12, "y": 4 }, "targets": [{ "refId": "A", "expr": "sum by (service) (rate({compose_project=\"traderx-state-009\",service=~\"price-publisher|trade-service|trade-processor|position-service\"}[1m]))" }], "fieldConfig": {"defaults": {"unit": "lines/s"}}, "options": {"legend": {"displayMode": "table", "placement": "bottom"}}},
 +        {"id": 7, "type": "logs", "title": "Pipeline Logs (Price / Trade / Position)", "datasource": { "type": "loki", "uid": "loki" }, "gridPos": { "h": 10, "w": 24, "x": 0, "y": 12 }, "targets": [{ "refId": "A", "expr": "{compose_project=\"traderx-state-009\",service=~\"price-publisher|trade-service|trade-processor|position-service\"}" }], "options": {"showLabels": true, "showTime": true, "wrapLogMessage": true, "enableLogDetails": true}}
 +      ]
@@ -2641,14 +2641,13 @@ index 0000000..79c96d3
 +          - targets:
 +              - http://edge-proxy:8080/health
 +              - http://edge-proxy:8080/
-+              - http://database:18084/
 +              - http://reference-data:18085/stocks
 +              - http://price-publisher:18100/health
 +              - http://price-publisher:18100/prices/IBM
 +              - http://account-service:18088/account/22214
 +              - http://people-service:18089/swagger
 +              - http://position-service:18090/health/alive
-+              - http://trade-processor:18091/health
++              - http://trade-processor:18091/system/health
 +              - http://trade-service:18092/v3/api-docs
 +              - http://web-front-end-angular:18093/
 +              - http://nats-broker:8222/varz
diff --git a/specs/013-radius-kubernetes-platform/generation/patches/0001-state-overlay.patch b/specs/013-radius-kubernetes-platform/generation/patches/0001-state-overlay.patch
index bf1ab52cb..13c0b32f2 100644
--- a/specs/013-radius-kubernetes-platform/generation/patches/0001-state-overlay.patch
+++ b/specs/013-radius-kubernetes-platform/generation/patches/0001-state-overlay.patch
@@ -2160,7 +2160,7 @@ index 7b87e12..0000000
 -        {"id": 2, "type": "stat", "title": "NATS Monitor Health", "datasource": { "type": "prometheus", "uid": "prometheus" }, "gridPos": { "h": 4, "w": 6, "x": 6, "y": 0 }, "targets": [{ "refId": "A", "expr": "max(probe_success{job=\"traderx-http-probe\",instance=\"http://nats-broker:8222/varz\"})" }], "fieldConfig": {"defaults": {"min": 0, "max": 1, "thresholds": {"mode": "absolute", "steps": [{"color": "red", "value": null}, {"color": "green", "value": 1}]}}}},
 -        {"id": 3, "type": "stat", "title": "Pricing Endpoint p95 (5m)", "datasource": { "type": "prometheus", "uid": "prometheus" }, "gridPos": { "h": 4, "w": 6, "x": 12, "y": 0 }, "targets": [{ "refId": "A", "expr": "quantile_over_time(0.95, probe_duration_seconds{job=\"traderx-http-probe\",instance=\"http://price-publisher:18100/prices/IBM\"}[5m])" }], "fieldConfig": {"defaults": {"unit": "s", "decimals": 3}}},
 -        {"id": 4, "type": "stat", "title": "Trade API p95 (5m)", "datasource": { "type": "prometheus", "uid": "prometheus" }, "gridPos": { "h": 4, "w": 6, "x": 18, "y": 0 }, "targets": [{ "refId": "A", "expr": "quantile_over_time(0.95, probe_duration_seconds{job=\"traderx-http-probe\",instance=\"http://trade-service:18092/v3/api-docs\"}[5m])" }], "fieldConfig": {"defaults": {"unit": "s", "decimals": 3}}},
--        {"id": 5, "type": "timeseries", "title": "Pricing + Trade Endpoints Success", "datasource": { "type": "prometheus", "uid": "prometheus" }, "gridPos": { "h": 8, "w": 12, "x": 0, "y": 4 }, "targets": [{ "refId": "A", "expr": "probe_success{job=\"traderx-http-probe\",instance=~\"http://price-publisher:18100/.*|http://trade-service:18092/.*|http://trade-processor:18091/health\"}" }], "fieldConfig": {"defaults": {"min": 0, "max": 1}}, "options": {"legend": {"displayMode": "table", "placement": "bottom"}}},
+-        {"id": 5, "type": "timeseries", "title": "Pricing + Trade Endpoints Success", "datasource": { "type": "prometheus", "uid": "prometheus" }, "gridPos": { "h": 8, "w": 12, "x": 0, "y": 4 }, "targets": [{ "refId": "A", "expr": "probe_success{job=\"traderx-http-probe\",instance=~\"http://price-publisher:18100/.*|http://trade-service:18092/.*|http://trade-processor:18091/system/health\"}" }], "fieldConfig": {"defaults": {"min": 0, "max": 1}}, "options": {"legend": {"displayMode": "table", "placement": "bottom"}}},
 -        {"id": 6, "type": "timeseries", "title": "Pricing Pipeline Log Throughput", "datasource": { "type": "loki", "uid": "loki" }, "gridPos": { "h": 8, "w": 12, "x": 12, "y": 4 }, "targets": [{ "refId": "A", "expr": "sum by (service) (rate({compose_project=\"traderx-state-009\",service=~\"price-publisher|trade-service|trade-processor|position-service\"}[1m]))" }], "fieldConfig": {"defaults": {"unit": "lines/s"}}, "options": {"legend": {"displayMode": "table", "placement": "bottom"}}},
 -        {"id": 7, "type": "logs", "title": "Pipeline Logs (Price / Trade / Position)", "datasource": { "type": "loki", "uid": "loki" }, "gridPos": { "h": 10, "w": 24, "x": 0, "y": 12 }, "targets": [{ "refId": "A", "expr": "{compose_project=\"traderx-state-009\",service=~\"price-publisher|trade-service|trade-processor|position-service\"}" }], "options": {"showLabels": true, "showTime": true, "wrapLogMessage": true, "enableLogDetails": true}}
 -      ]
@@ -2828,14 +2828,13 @@ index 79c96d3..0000000
 -          - targets:
 -              - http://edge-proxy:8080/health
 -              - http://edge-proxy:8080/
--              - http://database:18084/
 -              - http://reference-data:18085/stocks
 -              - http://price-publisher:18100/health
 -              - http://price-publisher:18100/prices/IBM
 -              - http://account-service:18088/account/22214
 -              - http://people-service:18089/swagger
 -              - http://position-service:18090/health/alive
--              - http://trade-processor:18091/health
+-              - http://trade-processor:18091/system/health
 -              - http://trade-service:18092/v3/api-docs
 -              - http://web-front-end-angular:18093/
 -              - http://nats-broker:8222/varz