diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml
index 7009e06b7e..5ef2b1cda9 100644
--- a/stable/datadog/Chart.yaml
+++ b/stable/datadog/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: datadog
-version: 2.2.4
+version: 2.2.5
 appVersion: "7"
 description: Datadog Agent
 keywords:
diff --git a/stable/datadog/templates/agent-clusterchecks-rbac.yaml b/stable/datadog/templates/agent-clusterchecks-rbac.yaml
index b36799b56a..da06257cd0 100644
--- a/stable/datadog/templates/agent-clusterchecks-rbac.yaml
+++ b/stable/datadog/templates/agent-clusterchecks-rbac.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.clusterChecksRunner.rbac.create .Values.clusterAgent.enabled .Values.datadog.clusterChecks.enabled .Values.clusterChecksRunner.enabled -}}
+{{- if and .Values.clusterChecksRunner.rbac.create .Values.clusterAgent.enabled .Values.datadog.clusterChecks.enabled .Values.clusterChecksRunner.enabled .Values.clusterChecksRunner.rbac.dedicated -}}
 apiVersion: {{ template "rbac.apiVersion" . }}
 kind: ClusterRoleBinding
 metadata:
diff --git a/stable/datadog/templates/rbac.yaml b/stable/datadog/templates/rbac.yaml
index a1b45518d0..74a5b044c9 100644
--- a/stable/datadog/templates/rbac.yaml
+++ b/stable/datadog/templates/rbac.yaml
@@ -84,7 +84,6 @@ rules:
   verbs:
   - get
 ---
-{{- if not .Values.clusterChecksRunner.rbac.dedicated }}
 apiVersion: {{ template "rbac.apiVersion" . }}
 kind: ClusterRoleBinding
 metadata:
@@ -103,7 +102,6 @@ subjects:
   - kind: ServiceAccount
     name: {{ template "datadog.fullname" . }}
     namespace: {{ .Release.Namespace }}
-{{- end }}
 ---
 apiVersion: v1
 kind: ServiceAccount