diff --git a/helm-guestbook/templates/cluster_analysis.yaml b/helm-guestbook/templates/cluster_analysis.yaml
index 8d15506..de805eb 100644
--- a/helm-guestbook/templates/cluster_analysis.yaml
+++ b/helm-guestbook/templates/cluster_analysis.yaml
@@ -12,6 +12,6 @@ spec:
       prometheus:
         address: "http://a0179abbebc504fe1a02cc2868d10d20-1436141555.us-east-2.elb.amazonaws.com:9090"
         query: |
-          avg(rate(app_not_founds_total{kubernetes_namespace="default", kubernetes_name="{{args.service-name}}"}[5m])) /
-          (avg(rate(app_requests_total{kubernetes_namespace="default", kubernetes_name="{{args.service-name}}"}[5m])) > 0) or
-          avg(rate(app_requests_total{kubernetes_namespace="default", kubernetes_name="{{args.service-name}}"}[5m]))
\ No newline at end of file
+          avg(rate(app_not_founds_total{kubernetes_namespace="default", kubernetes_name="{{ template "helm-guestbook.fullname" . }}"}[5m])) /
+          (avg(rate(app_requests_total{kubernetes_namespace="default", kubernetes_name="{{ template "helm-guestbook.fullname" . }}"}[5m])) > 0) or
+          avg(rate(app_requests_total{kubernetes_namespace="default", kubernetes_name="{{ template "helm-guestbook.fullname" . }}"}[5m]))
\ No newline at end of file
diff --git a/helm-guestbook/templates/rollout.yaml b/helm-guestbook/templates/rollout.yaml
index 08745fc..f544d16 100644
--- a/helm-guestbook/templates/rollout.yaml
+++ b/helm-guestbook/templates/rollout.yaml
@@ -61,7 +61,7 @@ spec:
         startingStep: 2 # delay starting analysis run until setWeight: 40%
         args:
         - name: service-name
-          value: guestbook-helm-guestbook
+          value: {{ template "helm-guestbook.fullname" . }}
       maxSurge: "25%"
       maxUnavailable: 0
       canaryService: guestbook-canary-service