diff --git a/charts/datadog-operator/CHANGELOG.md b/charts/datadog-operator/CHANGELOG.md
index 696ad3bdff..fa6688c8dc 100644
--- a/charts/datadog-operator/CHANGELOG.md
+++ b/charts/datadog-operator/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.24.0-dev.6
+
+* Add `revisionHistoryLimit` parameter to configure the number of ReplicaSet revisions retained by the Datadog Operator deployment for rollback purposes.
+
 ## 2.24.0-dev.5
 
 * Update Datadog Operator chart for 1.28.0-rc.4.
diff --git a/charts/datadog-operator/Chart.yaml b/charts/datadog-operator/Chart.yaml
index 997b2f67b8..643bbe1dd5 100644
--- a/charts/datadog-operator/Chart.yaml
+++ b/charts/datadog-operator/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: datadog-operator
-version: 2.24.0-dev.5
+version: 2.24.0-dev.6
 appVersion: 1.28.0-rc.4
 description: Datadog Operator
 keywords:
diff --git a/charts/datadog-operator/README.md b/charts/datadog-operator/README.md
index e11faa8a17..ca8799ff33 100644
--- a/charts/datadog-operator/README.md
+++ b/charts/datadog-operator/README.md
@@ -1,6 +1,6 @@
 # Datadog Operator
 
-![Version: 2.24.0-dev.5](https://img.shields.io/badge/Version-2.24.0--dev.5-informational?style=flat-square) ![AppVersion: 1.28.0-rc.4](https://img.shields.io/badge/AppVersion-1.28.0--rc.4-informational?style=flat-square)
+![Version: 2.24.0-dev.6](https://img.shields.io/badge/Version-2.24.0--dev.6-informational?style=flat-square) ![AppVersion: 1.28.0-rc.4](https://img.shields.io/badge/AppVersion-1.28.0--rc.4-informational?style=flat-square)
 
 ## Values
 
@@ -61,6 +61,7 @@
 | remoteConfiguration.enabled | bool | `false` | If true, enables Remote Configuration in the Datadog Operator (beta). Requires clusterName, API and App keys to be set. |
 | replicaCount | int | `1` | Number of instances of Datadog Operator |
 | resources | object | `{}` | Set resources requests/limits for Datadog Operator PODs |
+| revisionHistoryLimit | int | `10` | The number of ReplicaSet revisions to keep in the Deployment for rollback purposes |
 | secretBackend.arguments | string | `""` | Specifies the space-separated arguments passed to the command that implements the secret backend api |
 | secretBackend.command | string | `""` | Specifies the path to the command that implements the secret backend api |
 | secretBackend.refreshInterval | string | `nil` | Specifies the secret backend refresh interval in seconds. |
diff --git a/charts/datadog-operator/ci/kubeconform-values.yaml b/charts/datadog-operator/ci/kubeconform-values.yaml
index e69de29bb2..ba1292f5c9 100644
--- a/charts/datadog-operator/ci/kubeconform-values.yaml
+++ b/charts/datadog-operator/ci/kubeconform-values.yaml
@@ -0,0 +1,2 @@
+# Non-default values exercised by CI manifest validation.
+revisionHistoryLimit: 5
diff --git a/charts/datadog-operator/templates/deployment.yaml b/charts/datadog-operator/templates/deployment.yaml
index 9c8614f5bf..f0361c1363 100644
--- a/charts/datadog-operator/templates/deployment.yaml
+++ b/charts/datadog-operator/templates/deployment.yaml
@@ -11,6 +11,7 @@ metadata:
 {{ include "datadog-operator.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
+  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "datadog-operator.name" . }}
@@ -51,7 +52,7 @@ spec:
       serviceAccountName: {{ include "datadog-operator.serviceAccountName" . }}
       {{- if eq .Values.serviceAccount.automountServiceAccountToken false }}
       automountServiceAccountToken: false
-      {{- end }} 
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
diff --git a/charts/datadog-operator/values.yaml b/charts/datadog-operator/values.yaml
index b614313d85..fdeaa2ae35 100644
--- a/charts/datadog-operator/values.yaml
+++ b/charts/datadog-operator/values.yaml
@@ -155,6 +155,8 @@ nodeSelector:
 tolerations: []
 # affinity -- Allows to specify affinity for Datadog Operator PODs
 affinity: {}
+# revisionHistoryLimit -- The number of ReplicaSet revisions to keep in the Deployment for rollback purposes
+revisionHistoryLimit: 10
 
 # dnsConfig -- Specify DNS configuration options for Datadog Operator PODs
 dnsConfig: {}
diff --git a/test/datadog-operator/baseline/Operator_Deployment_default.yaml b/test/datadog-operator/baseline/Operator_Deployment_default.yaml
index b7a01d75c4..1e30b96464 100644
--- a/test/datadog-operator/baseline/Operator_Deployment_default.yaml
+++ b/test/datadog-operator/baseline/Operator_Deployment_default.yaml
@@ -7,12 +7,13 @@ metadata:
   namespace: datadog-agent
   labels:
     app.kubernetes.io/name: datadog-operator
-    helm.sh/chart: datadog-operator-2.24.0-dev.5
+    helm.sh/chart: datadog-operator-2.24.0-dev.6
     app.kubernetes.io/instance: datadog-operator
     app.kubernetes.io/version: "1.28.0-rc.4"
     app.kubernetes.io/managed-by: Helm
 spec:
   replicas: 1
+  revisionHistoryLimit: 10
   selector:
     matchLabels:
       app.kubernetes.io/name: datadog-operator
@@ -32,7 +33,7 @@ spec:
             "metrics": ["*"]
           }]
     spec:
-      serviceAccountName: datadog-operator 
+      serviceAccountName: datadog-operator
       containers:
         - name: datadog-operator
           image: "registry.datadoghq.com/operator:1.28.0-rc.4"