diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml
index e24540cb2f..0dae90a54a 100755
--- a/stable/datadog/Chart.yaml
+++ b/stable/datadog/Chart.yaml
@@ -1,5 +1,5 @@
 name: datadog
-version: 1.15.0
+version: 1.15.1
 appVersion: 6.6.0
 description: DataDog Agent
 keywords:
diff --git a/stable/datadog/templates/NOTES.txt b/stable/datadog/templates/NOTES.txt
index 9d78052ef7..9cb829aeb7 100644
--- a/stable/datadog/templates/NOTES.txt
+++ b/stable/datadog/templates/NOTES.txt
@@ -53,6 +53,9 @@ Create an application key at https://app.datadoghq.com/account/settings#api
 Because you enabled the Cluster Agent but did not provide a token, a random token was generated.
 This token is used to secure the communication between the Agents and the Cluster Agent.
 
+Make sure to recreate all pods on upgrade (with the --recreate-pods flag) to ensure all
+agents use the same shared token.
+
   {{- end }}
 
 {{- end }}
diff --git a/stable/datadog/templates/cluster-agent-deployment.yaml b/stable/datadog/templates/cluster-agent-deployment.yaml
index 7b883e72b1..5de9de64c6 100644
--- a/stable/datadog/templates/cluster-agent-deployment.yaml
+++ b/stable/datadog/templates/cluster-agent-deployment.yaml
@@ -74,6 +74,8 @@ spec:
           {{- if .Values.datadog.collectEvents }}
           - name: DD_COLLECT_KUBERNETES_EVENTS
             value: {{ .Values.datadog.collectEvents | quote}}
+          - name: DD_CLUSTER_AGENT_KUBERNETES_SERVICE_NAME
+            value: {{ template "datadog.clusterAgent.fullname" . }}
           {{- end }}
           - name: DD_CLUSTER_AGENT_AUTH_TOKEN
             valueFrom: