diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml
index 2a50a6b928..b5ea620fc2 100644
--- a/stable/datadog/Chart.yaml
+++ b/stable/datadog/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: datadog
-version: 1.39.8
+version: 1.39.9
 appVersion: "7"
 description: DataDog Agent
 keywords:
diff --git a/stable/datadog/templates/cluster-agent-config-configmap.yaml b/stable/datadog/templates/cluster-agent-config-configmap.yaml
new file mode 100644
index 0000000000..2365b239ac
--- /dev/null
+++ b/stable/datadog/templates/cluster-agent-config-configmap.yaml
@@ -0,0 +1,18 @@
+{{- if .Values.clusterAgent.datadog_cluster_yaml }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "datadog.fullname" . }}-cluster-agent-config
+  labels:
+    app: "{{ template "datadog.fullname" . }}"
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    app.kubernetes.io/name: "{{ template "datadog.fullname" . }}"
+    app.kubernetes.io/instance: {{ .Release.Name | quote }}
+    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+data:
+{{tpl (toYaml .Values.clusterAgent.datadog_cluster_yaml) . | indent 2}}
+{{- end }}
diff --git a/stable/datadog/templates/cluster-agent-deployment.yaml b/stable/datadog/templates/cluster-agent-deployment.yaml
index 22b605ceec..08fc0f02c7 100644
--- a/stable/datadog/templates/cluster-agent-deployment.yaml
+++ b/stable/datadog/templates/cluster-agent-deployment.yaml
@@ -175,12 +175,24 @@ spec:
 {{- if .Values.clusterAgent.volumeMounts }}
 {{ toYaml .Values.clusterAgent.volumeMounts | indent 10 }}
 {{- end }}
+{{- if .Values.clusterAgent.datadog_cluster_yaml }}
+          - name: cluster-agent-yaml
+            mountPath: /etc/datadog-agent/datadog-cluster.yaml
+            subPath: datadog-cluster.yaml
+            readOnly: true
+{{- end}}
       volumes:
 {{- if .Values.clusterAgent.confd }}
         - name: confd
           configMap:
             name: {{ template "datadog.fullname" . }}-cluster-agent-confd
 {{- end }}
+{{- if .Values.clusterAgent.datadog_cluster_yaml }}
+        - name: cluster-agent-yaml
+          configMap:
+            name: {{ template "datadog.fullname" . }}-cluster-agent-config
+{{- end}}
+
 {{- if .Values.clusterAgent.volumes }}
 {{ toYaml .Values.clusterAgent.volumes | indent 10 }}
 {{- end }}
diff --git a/stable/datadog/values.yaml b/stable/datadog/values.yaml
index c653c0d2a7..ef0af021f0 100644
--- a/stable/datadog/values.yaml
+++ b/stable/datadog/values.yaml
@@ -486,6 +486,10 @@ clusterAgent:
   #   - name: <VOLUME_NAME>
   #     mountPath: <CONTAINER_PATH>
   #     readOnly: true
+  ## @param datadog-cluster.yaml - object - optional
+  ## Specify custom contents for the datadog cluster agent config (datadog-cluster.yaml).
+  #
+  # datadog_cluster_yaml: {}
 
 rbac:
 
@@ -760,7 +764,7 @@ daemonset:
 deployment:
   ## @param enabled - boolean - required
   ## Apart from DaemonSet, deploy Datadog agent pods and related service for
-  ## applications that want to send custom metrics. Provides DogStasD service.
+  ## applications that want to send custom metrics. Provides DogStatsD service.
   #
   enabled: false