diff --git a/examples/datadogagent/v2alpha1/datadog-agent-all.yaml b/examples/datadogagent/v2alpha1/datadog-agent-all.yaml
index 8cedf801e..fd7a627db 100644
--- a/examples/datadogagent/v2alpha1/datadog-agent-all.yaml
+++ b/examples/datadogagent/v2alpha1/datadog-agent-all.yaml
@@ -8,19 +8,53 @@ spec:
       apiKey: <DATADOG_API_KEY>
       appKey: <DATADOG_APP_KEY>
   features:
-    apm:
+    logCollection:
       enabled: true
     liveProcessCollection:
       enabled: true
-    logCollection:
+    liveContainerCollection:
       enabled: true
-    admissionController:
+    processDiscovery:
       enabled: true
-    externalMetricsServer:
+    oomKill:
+      enabled: true
+    tcpQueueLength:
+      enabled: true
+    ebpfCheck:
+      enabled: true
+    apm:
       enabled: true
     cspm:
       enabled: true
     cws:
       enabled: true
+    npm:
+      enabled: true
+    usm:
+      enabled: true
+    dogstatsd:
+      unixDomainSocketConfig:
+        enabled: true
+    otlp:
+      receiver:
+        protocols:
+          grpc:
+            enabled: true
+    remoteConfiguration:
+      enabled: true
+    sbom:
+      enabled: true
+    eventCollection:
+      collectKubernetesEvents: true
     orchestratorExplorer:
       enabled: true
+    kubeStateMetricsCore:
+      enabled: true
+    admissionController:
+      enabled: true
+    externalMetricsServer:
+      enabled: true
+    clusterChecks:
+      enabled: true
+    prometheusScrape:
+      enabled: true
diff --git a/examples/datadogagent/v2alpha1/datadog-agent-logs.yaml b/examples/datadogagent/v2alpha1/datadog-agent-logs.yaml
deleted file mode 100644
index a789177d0..000000000
--- a/examples/datadogagent/v2alpha1/datadog-agent-logs.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: datadoghq.com/v2alpha1
-kind: DatadogAgent
-metadata:
-  name: datadog
-spec:
-  features:
-    logCollection:
-      enabled: true
-  global:
-    credentials:
-      apiKey: <DATADOG_API_KEY>
-      appKey: <DATADOG_APP_KEY>
diff --git a/examples/datadogagent/v2alpha1/datadog-agent.yaml b/examples/datadogagent/v2alpha1/datadog-agent-minimum.yaml
similarity index 100%
rename from examples/datadogagent/v2alpha1/datadog-agent.yaml
rename to examples/datadogagent/v2alpha1/datadog-agent-minimum.yaml
diff --git a/examples/datadogagent/v2alpha1/datadog-agent-openshift.yaml b/examples/datadogagent/v2alpha1/datadog-agent-on-openshift.yaml
similarity index 100%
rename from examples/datadogagent/v2alpha1/datadog-agent-openshift.yaml
rename to examples/datadogagent/v2alpha1/datadog-agent-on-openshift.yaml
diff --git a/examples/datadogagent/v2alpha1/datadog-agent-apm.yaml b/examples/datadogagent/v2alpha1/datadog-agent-with-apm-hostport.yaml
similarity index 100%
rename from examples/datadogagent/v2alpha1/datadog-agent-apm.yaml
rename to examples/datadogagent/v2alpha1/datadog-agent-with-apm-hostport.yaml
diff --git a/examples/datadogagent/v2alpha1/datadog-agent-cluster-agent-confd.yaml b/examples/datadogagent/v2alpha1/datadog-agent-with-cluster-agent-confd.yaml
similarity index 100%
rename from examples/datadogagent/v2alpha1/datadog-agent-cluster-agent-confd.yaml
rename to examples/datadogagent/v2alpha1/datadog-agent-with-cluster-agent-confd.yaml
diff --git a/examples/datadogagent/v2alpha1/datadog-agent-with-extraconfd.yaml b/examples/datadogagent/v2alpha1/datadog-agent-with-extraconfd.yaml
new file mode 100644
index 000000000..e207472d6
--- /dev/null
+++ b/examples/datadogagent/v2alpha1/datadog-agent-with-extraconfd.yaml
@@ -0,0 +1,21 @@
+apiVersion: datadoghq.com/v2alpha1
+kind: DatadogAgent
+metadata:
+  name: datadog
+spec:
+  global:
+    credentials:
+      apiKey: <DATADOG_API_KEY>
+  override:
+    nodeAgent:
+      extraConfd:
+        configMap:
+          name: <existing_config_map>
+          items:
+            - key: 'conf.yaml'
+              path: '<integration_name>.yaml'
+        # Alternative to referencing a configmap
+        # configDataMap:
+        #   <integration_name>.yaml: |-
+        #     init_config:
+        #     instances:
diff --git a/examples/datadogagent/v2alpha1/datadog-agent-ksm-core-custom-conf.yaml b/examples/datadogagent/v2alpha1/datadog-agent-with-ksm-core-custom-conf.yaml
similarity index 100%
rename from examples/datadogagent/v2alpha1/datadog-agent-ksm-core-custom-conf.yaml
rename to examples/datadogagent/v2alpha1/datadog-agent-with-ksm-core-custom-conf.yaml
diff --git a/examples/datadogagent/v2alpha1/datadog-agent-logs-apm.yaml b/examples/datadogagent/v2alpha1/datadog-agent-with-logs-apm.yaml
similarity index 100%
rename from examples/datadogagent/v2alpha1/datadog-agent-logs-apm.yaml
rename to examples/datadogagent/v2alpha1/datadog-agent-with-logs-apm.yaml
diff --git a/examples/datadogagent/v2alpha1/datadog-agent-orchestrator-custom-conf.yaml b/examples/datadogagent/v2alpha1/datadog-agent-with-orchestrator-custom-conf.yaml
similarity index 100%
rename from examples/datadogagent/v2alpha1/datadog-agent-orchestrator-custom-conf.yaml
rename to examples/datadogagent/v2alpha1/datadog-agent-with-orchestrator-custom-conf.yaml
diff --git a/examples/datadogagent/v2alpha1/datadog-agent-otlp.yaml b/examples/datadogagent/v2alpha1/datadog-agent-with-otlp.yaml
similarity index 100%
rename from examples/datadogagent/v2alpha1/datadog-agent-otlp.yaml
rename to examples/datadogagent/v2alpha1/datadog-agent-with-otlp.yaml
diff --git a/examples/datadogagent/v2alpha1/datadog-agent-secret-backend.yaml b/examples/datadogagent/v2alpha1/datadog-agent-with-secret-backend.yaml
similarity index 100%
rename from examples/datadogagent/v2alpha1/datadog-agent-secret-backend.yaml
rename to examples/datadogagent/v2alpha1/datadog-agent-with-secret-backend.yaml
diff --git a/examples/datadogagent/v2alpha1/min.yaml b/examples/datadogagent/v2alpha1/datadog-agent-with-secret-keys.yaml
similarity index 100%
rename from examples/datadogagent/v2alpha1/min.yaml
rename to examples/datadogagent/v2alpha1/datadog-agent-with-secret-keys.yaml
diff --git a/examples/datadogagent/v2alpha1/datadog-agent-unix-socket.yaml b/examples/datadogagent/v2alpha1/datadog-agent-with-unix-socket.yaml
similarity index 100%
rename from examples/datadogagent/v2alpha1/datadog-agent-unix-socket.yaml
rename to examples/datadogagent/v2alpha1/datadog-agent-with-unix-socket.yaml