diff --git a/README.md b/README.md
index 048aec30..c25e5866 100644
--- a/README.md
+++ b/README.md
@@ -118,13 +118,13 @@ spec:
     stepWeight: 5
     # Istio Prometheus checks
     metrics:
-    # builtin Istio checks
-    - name: istio_requests_total
+    # builtin checks
+    - name: request-success-rate
       # minimum req success rate (non 5xx responses)
       # percentage (0-100)
       threshold: 99
       interval: 1m
-    - name: istio_request_duration_seconds_bucket
+    - name: request-duration
       # maximum req duration P99
       # milliseconds
       threshold: 500
diff --git a/artifacts/ab-testing/canary.yaml b/artifacts/ab-testing/canary.yaml
index 226a8c74..eb96fd22 100644
--- a/artifacts/ab-testing/canary.yaml
+++ b/artifacts/ab-testing/canary.yaml
@@ -43,12 +43,12 @@ spec:
           cookie:
             regex: "^(.*?;)?(type=insider)(;.*)?$"
     metrics:
-    - name: istio_requests_total
+    - name: request-success-rate
       # minimum req success rate (non 5xx responses)
       # percentage (0-100)
       threshold: 99
       interval: 1m
-    - name: istio_request_duration_seconds_bucket
+    - name: request-duration
       # maximum req duration P99
       # milliseconds
       threshold: 500
diff --git a/artifacts/appmesh/canary.yaml b/artifacts/appmesh/canary.yaml
index b89dc903..d16ea07d 100644
--- a/artifacts/appmesh/canary.yaml
+++ b/artifacts/appmesh/canary.yaml
@@ -36,7 +36,7 @@ spec:
     stepWeight: 5
     # App Mesh Prometheus checks
     metrics:
-    - name: envoy_cluster_upstream_rq
+    - name: request-success-rate
       # minimum req success rate (non 5xx responses)
       # percentage (0-100)
       threshold: 99
diff --git a/artifacts/canaries/canary.yaml b/artifacts/canaries/canary.yaml
index 4599291c..ca023e05 100644
--- a/artifacts/canaries/canary.yaml
+++ b/artifacts/canaries/canary.yaml
@@ -56,12 +56,12 @@ spec:
     stepWeight: 5
     # Istio Prometheus checks
     metrics:
-    - name: istio_requests_total
+    - name: request-success-rate
       # minimum req success rate (non 5xx responses)
       # percentage (0-100)
       threshold: 99
       interval: 1m
-    - name: istio_request_duration_seconds_bucket
+    - name: request-duration
       # maximum req duration P99
       # milliseconds
       threshold: 500
diff --git a/artifacts/configs/canary.yaml b/artifacts/configs/canary.yaml
index c2a853f3..9e666222 100644
--- a/artifacts/configs/canary.yaml
+++ b/artifacts/configs/canary.yaml
@@ -40,12 +40,12 @@ spec:
     stepWeight: 5
     # Istio Prometheus checks
     metrics:
-    - name: istio_requests_total
+    - name: request-success-rate
       # minimum req success rate (non 5xx responses)
       # percentage (0-100)
       threshold: 99
       interval: 1m
-    - name: istio_request_duration_seconds_bucket
+    - name: request-duration
       # maximum req duration P99
       # milliseconds
       threshold: 500
diff --git a/charts/podinfo/Chart.yaml b/charts/podinfo/Chart.yaml
index c9bf218f..f2d33f2e 100644
--- a/charts/podinfo/Chart.yaml
+++ b/charts/podinfo/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 2.0.0
+version: 2.0.1
 appVersion: 1.4.0
 name: podinfo
 engine: gotpl
diff --git a/charts/podinfo/templates/canary.yaml b/charts/podinfo/templates/canary.yaml
index 92cc5865..9fb007ec 100644
--- a/charts/podinfo/templates/canary.yaml
+++ b/charts/podinfo/templates/canary.yaml
@@ -32,10 +32,10 @@ spec:
     maxWeight: {{ .Values.canary.analysis.maxWeight }}
     stepWeight: {{ .Values.canary.analysis.stepWeight }}
     metrics:
-    - name: istio_requests_total
+    - name: request-success-rate
       threshold: {{ .Values.canary.thresholds.successRate }}
       interval: 1m
-    - name: istio_request_duration_seconds_bucket
+    - name: request-duration
       threshold: {{ .Values.canary.thresholds.latency }}
       interval: 1m
     {{- if .Values.canary.loadtest.enabled }}