diff --git a/Makefile b/Makefile
index 6ccac1be..109302aa 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ run:
 
 run-appmesh:
 	go run cmd/flagger/* -kubeconfig=$$HOME/.kube/config -log-level=info -mesh-provider=appmesh \
-	-metrics-server=http://ab3325177465c11e9a94c02c4171f346-2027522465.us-west-2.elb.amazonaws.com:9090 \
+	-metrics-server=http://acfc235624ca911e9a94c02c4171f346-1585187926.us-west-2.elb.amazonaws.com:9090 \
 	-slack-url=https://hooks.slack.com/services/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 \
 	-slack-channel="devops-alerts"
 
diff --git a/pkg/controller/observer.go b/pkg/controller/observer.go
index 1e846c6f..19eabff0 100644
--- a/pkg/controller/observer.go
+++ b/pkg/controller/observer.go
@@ -114,11 +114,12 @@ func (c *CanaryObserver) GetEnvoySuccessRate(name string, namespace string, metr
 	var rate *float64
 	querySt := url.QueryEscape(`sum(rate(` +
 		metric + `{kubernetes_namespace="` +
-		namespace + `",app="` +
-		name + `",envoy_response_code!~"5.*"}[1m])) / sum(rate(` +
+		namespace + `",kubernetes_pod_name=~"` +
+		name + `-[0-9a-zA-Z]+(-[0-9a-zA-Z]+)",envoy_response_code!~"5.*"}[` +
+		interval + `])) / sum(rate(` +
 		metric + `{kubernetes_namespace="` +
-		namespace + `",app="` +
-		name + `"}[` +
+		namespace + `",kubernetes_pod_name=~"` +
+		name + `-[0-9a-zA-Z]+(-[0-9a-zA-Z]+)"}[` +
 		interval + `])) * 100 `)
 	result, err := c.queryMetric(querySt)
 	if err != nil {
@@ -152,7 +153,8 @@ func (c *CanaryObserver) GetDeploymentCounter(name string, namespace string, met
 	querySt := url.QueryEscape(`sum(rate(` +
 		metric + `{reporter="destination",destination_workload_namespace=~"` +
 		namespace + `",destination_workload=~"` +
-		name + `",response_code!~"5.*"}[1m])) / sum(rate(` +
+		name + `",response_code!~"5.*"}[` +
+		interval + `])) / sum(rate(` +
 		metric + `{reporter="destination",destination_workload_namespace=~"` +
 		namespace + `",destination_workload=~"` +
 		name + `"}[` +