diff --git a/vistio/values-mesh-only.yaml b/vistio/values-mesh-only.yaml
index c5d2f1bf2cbe441e4864387704ac76e6ea5227e5..1febc65580d9600b20fd33e45428f624ad1337b0 100644
--- a/vistio/values-mesh-only.yaml
+++ b/vistio/values-mesh-only.yaml
@@ -11,7 +11,7 @@ vistioConfig:
     maxVolume: 100
     clusterConnections:
       # Total requests per second of the mesh
-      - query: sum(rate(istio_request_count[1m])) by (response_code)
+      - query: sum(rate(istio_requests_total[1m])) by (response_code)
         prometheusURL: http://prometheus.istio-system:9090
         source:
           replacement: "Total Mesh Requests"
@@ -27,10 +27,10 @@ vistioConfig:
     - cluster: istio-mesh
       maxVolume: 100
       serviceConnections:
-        - query: sum(rate(istio_request_count[1m])) by (source_service,destination_service,response_code)
+        - query: sum(rate(istio_requests_total[1m])) by (source_app,destination_service,response_code)
           prometheusURL: http://prometheus.istio-system:9090
           source:
-            label: source_service
+            label: source_app
           target:
             label: destination_service
           status:
diff --git a/vistio/values-with-ingress.yaml b/vistio/values-with-ingress.yaml
index cad1d746f9e548dbdde359a964edce3d549d1da7..37bed895df1690224f279eb2adca631d32d79106 100644
--- a/vistio/values-with-ingress.yaml
+++ b/vistio/values-with-ingress.yaml
@@ -9,7 +9,7 @@ vistioConfig:
     maxVolume: 2000000
     clusterConnections:
       # Total requests per second coming into the ingress controller from internet
-      - query: sum(rate(istio_request_count{destination_service="istio-ingressgateway.istio-system.svc.cluster.local"}[1m])) by (response_code)
+      - query: sum(rate(istio_requests_total{reporter="source", source_workload="istio-ingressgateway"}[1m])) by (response_code)
         prometheusURL: http://prometheus.istio-system:9090
         source:
           replacement: INTERNET
@@ -25,10 +25,10 @@ vistioConfig:
     - cluster: istio-mesh
       maxVolume: 3000
       serviceConnections:
-        - query: sum(rate(istio_request_count[1m])) by (source_service,destination_service,response_code)
+        - query: sum(rate(istio_requests_total[1m])) by (source_app,destination_service,response_code)
           prometheusURL: http://prometheus.istio-system:9090
           source:
-            label: source_service
+            label: source_app
           target:
             label: destination_service
           status: