diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml
index 4649040270..5339603be2 100755
--- a/stable/datadog/Chart.yaml
+++ b/stable/datadog/Chart.yaml
@@ -1,5 +1,5 @@
 name: datadog
-version: 0.18.0
+version: 0.18.1
 appVersion: 6.3.0
 description: DataDog Agent
 keywords:
diff --git a/stable/datadog/templates/autoconf-configmap.yaml b/stable/datadog/templates/autoconf-configmap.yaml
index 5e06760f43..6afe6dfd4f 100644
--- a/stable/datadog/templates/autoconf-configmap.yaml
+++ b/stable/datadog/templates/autoconf-configmap.yaml
@@ -3,10 +3,10 @@ kind: ConfigMap
 metadata:
   name: {{ template "datadog.autoconf.fullname" . }}
   labels:
-    app: {{ template "datadog.autoconf.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    app: "{{ template "datadog.autoconf.fullname" . }}"
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
   annotations:
     checksum/autoconf-config: {{ toYaml .Values.datadog.autoconf | sha256sum }}
 data:
diff --git a/stable/datadog/templates/checksd-configmap.yaml b/stable/datadog/templates/checksd-configmap.yaml
index b3971c7801..b78e77e2d7 100644
--- a/stable/datadog/templates/checksd-configmap.yaml
+++ b/stable/datadog/templates/checksd-configmap.yaml
@@ -3,10 +3,10 @@ kind: ConfigMap
 metadata:
   name: {{ template "datadog.checksd.fullname" . }}
   labels:
-    app: {{ template "datadog.checksd.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    app: "{{ template "datadog.checksd.fullname" . }}"
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
   annotations:
     checksum/checksd-config: {{ toYaml .Values.datadog.checksd | sha256sum }}
 data:
diff --git a/stable/datadog/templates/clusterrole.yaml b/stable/datadog/templates/clusterrole.yaml
index c2d0fe3f4a..18332c87e4 100644
--- a/stable/datadog/templates/clusterrole.yaml
+++ b/stable/datadog/templates/clusterrole.yaml
@@ -3,10 +3,10 @@ apiVersion: {{ template "rbac.apiVersion" . }}
 kind: ClusterRole
 metadata:
   labels:
-    app: {{ template "datadog.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app: "{{ template "datadog.fullname" . }}"
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    heritage: {{ .Release.Service | quote }}
+    release: {{ .Release.Name | quote }}
   name: {{ template "datadog.fullname" . }}
 rules:
 - nonResourceURLs:
diff --git a/stable/datadog/templates/clusterrolebinding.yaml b/stable/datadog/templates/clusterrolebinding.yaml
index 81e410e098..7db402447c 100644
--- a/stable/datadog/templates/clusterrolebinding.yaml
+++ b/stable/datadog/templates/clusterrolebinding.yaml
@@ -3,10 +3,10 @@ apiVersion: {{ template "rbac.apiVersion" . }}
 kind: ClusterRoleBinding
 metadata:
   labels:
-    app: {{ template "datadog.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app: "{{ template "datadog.fullname" . }}"
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
   name: {{ template "datadog.fullname" . }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
diff --git a/stable/datadog/templates/confd-configmap.yaml b/stable/datadog/templates/confd-configmap.yaml
index dcc88e6447..93a9ae6429 100644
--- a/stable/datadog/templates/confd-configmap.yaml
+++ b/stable/datadog/templates/confd-configmap.yaml
@@ -3,10 +3,10 @@ kind: ConfigMap
 metadata:
   name: {{ template "datadog.confd.fullname" . }}
   labels:
-    app: {{ template "datadog.confd.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    app: "{{ template "datadog.confd.fullname" . }}"
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
   annotations:
     checksum/confd-config: {{ toYaml .Values.datadog.confd | sha256sum }}
 data:
diff --git a/stable/datadog/templates/daemonset.yaml b/stable/datadog/templates/daemonset.yaml
index 2089e4119a..f13fcff2c6 100644
--- a/stable/datadog/templates/daemonset.yaml
+++ b/stable/datadog/templates/daemonset.yaml
@@ -5,7 +5,10 @@ kind: DaemonSet
 metadata:
   name: {{ template "datadog.fullname" . }}
   labels:
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    app: "{{ template "datadog.fullname" . }}"
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
 spec:
   template:
     metadata:
diff --git a/stable/datadog/templates/deployment.yaml b/stable/datadog/templates/deployment.yaml
index 0019b2c0a6..83e435b6d4 100644
--- a/stable/datadog/templates/deployment.yaml
+++ b/stable/datadog/templates/deployment.yaml
@@ -5,7 +5,10 @@ kind: Deployment
 metadata:
   name: {{ template "datadog.fullname" . }}
   labels:
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    app: "{{ template "datadog.fullname" . }}"
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
 spec:
   replicas: {{ .Values.deployment.replicas }}
   template:
diff --git a/stable/datadog/templates/secrets.yaml b/stable/datadog/templates/secrets.yaml
index fd5638c077..9c3078d17e 100644
--- a/stable/datadog/templates/secrets.yaml
+++ b/stable/datadog/templates/secrets.yaml
@@ -5,10 +5,10 @@ kind: Secret
 metadata:
   name: {{ template "datadog.fullname" . }}
   labels:
-    app: {{ template "datadog.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    app: "{{ template "datadog.fullname" . }}"
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
 type: Opaque
 data:
   api-key: {{ default "MISSING" .Values.datadog.apiKey | b64enc | quote }}
diff --git a/stable/datadog/templates/service.yaml b/stable/datadog/templates/service.yaml
index 684073544e..b7f27790ea 100644
--- a/stable/datadog/templates/service.yaml
+++ b/stable/datadog/templates/service.yaml
@@ -4,9 +4,10 @@ kind: Service
 metadata:
   name: {{ template "datadog.fullname" . }}
   labels:
-    app: {{ template "datadog.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
+    app: "{{ template "datadog.fullname" . }}"
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
 spec:
   type: {{ .Values.serviceType }}
   selector:
diff --git a/stable/datadog/templates/serviceaccount.yaml b/stable/datadog/templates/serviceaccount.yaml
index b7331e28d0..91224ff05c 100644
--- a/stable/datadog/templates/serviceaccount.yaml
+++ b/stable/datadog/templates/serviceaccount.yaml
@@ -4,9 +4,9 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    app: {{ template "datadog.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app: "{{ template "datadog.fullname" . }}"
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    heritage: {{ .Release.Service | quote }}
+    release: {{ .Release.Name | quote }}
   name: {{ template "datadog.fullname" . }}
 {{- end -}}