diff --git a/charts/datadog-operator/CHANGELOG.md b/charts/datadog-operator/CHANGELOG.md
index d3d0db32a..a65ae2b42 100644
--- a/charts/datadog-operator/CHANGELOG.md
+++ b/charts/datadog-operator/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 2.6.0
 
 * Update Datadog Operator version to 1.12.0.
+* Add DatadogGenericResource configuration.
 
 ## 2.5.1
 
diff --git a/charts/datadog-operator/templates/deployment.yaml b/charts/datadog-operator/templates/deployment.yaml
index 6532eb07c..8a616fa7b 100644
--- a/charts/datadog-operator/templates/deployment.yaml
+++ b/charts/datadog-operator/templates/deployment.yaml
@@ -148,6 +148,9 @@ spec:
           {{- if (semverCompare ">=1.9.0-0" $version) }}
             - "-datadogDashboardEnabled={{ .Values.datadogDashboard.enabled }}"
           {{- end }}
+          {{- if (semverCompare ">=1.12.0" $version) }}
+            - "-datadogGenericResourceEnabled={{ .Values.datadogGenericResource.enabled }}"
+          {{- end }}
           {{- if (semverCompare ">=1.7.0" $version) }}
             - "-remoteConfigEnabled={{ .Values.remoteConfiguration.enabled }}"
           {{- end }}
diff --git a/charts/datadog-operator/values.yaml b/charts/datadog-operator/values.yaml
index 8c805053d..727b6bc1d 100644
--- a/charts/datadog-operator/values.yaml
+++ b/charts/datadog-operator/values.yaml
@@ -87,6 +87,9 @@ datadogAgent:
 datadogDashboard:
   # datadogDashboard.enabled -- Enables the Datadog Dashboard controller
   enabled: false
+datadogGenericResource:
+  # datadogGenericResource.enabled -- Enables the Datadog Generic Resource controller
+  enabled: false
 datadogMonitor:
   # datadogMonitor.enabled -- Enables the Datadog Monitor controller
   enabled: false
@@ -147,6 +150,8 @@ datadogCRDs:
     datadogSLOs: false
     # datadogCRDs.crds.datadogDashboards -- Set to true to deploy the DatadogDashboard CRD
     datadogDashboards: false
+    # datadogCRDs.crds.datadogGenericResources -- Set to true to deploy the datadogGenericResource CRD
+    datadogGenericResources: false
 
 # podAnnotations -- Allows setting additional annotations for Datadog Operator PODs
 podAnnotations: {}
diff --git a/test/datadog-operator/baseline/Operator_Deployment_default.yaml b/test/datadog-operator/baseline/Operator_Deployment_default.yaml
index 65f21f3a2..84be9b411 100644
--- a/test/datadog-operator/baseline/Operator_Deployment_default.yaml
+++ b/test/datadog-operator/baseline/Operator_Deployment_default.yaml
@@ -60,6 +60,7 @@ spec:
             - "-datadogAgentEnabled=true"
             - "-datadogSLOEnabled=false"
             - "-datadogDashboardEnabled=false"
+            - "-datadogGenericResourceEnabled=false"
             - "-remoteConfigEnabled=false"
           ports:
             - name: metrics