diff --git a/charts/datadog/Chart.yaml b/charts/datadog/Chart.yaml
index 63f0b811..735bda07 100644
--- a/charts/datadog/Chart.yaml
+++ b/charts/datadog/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: datadog-operator
-version: 1.0.7
+version: 1.0.8
 appVersion: 1.3.0
 description: Datadog Operator
 dependencies:
diff --git a/charts/datadog/templates/datadog-agent.yaml b/charts/datadog/templates/datadog-agent.yaml
index 72dfe791..2e071e97 100644
--- a/charts/datadog/templates/datadog-agent.yaml
+++ b/charts/datadog/templates/datadog-agent.yaml
@@ -1,58 +1,31 @@
-apiVersion: datadoghq.com/v1alpha1
+apiVersion: datadoghq.com/v2alpha1
 kind: DatadogAgent
 metadata:
-  namespace: datadog
   name: datadog
 spec:
-  credentials:
-    apiSecret:
-      secretName: datadog-secrets
-      keyName: api-key
-    appSecret:
-      secretName: datadog-secrets
-      keyName: app-key
-  agent:
-    image:
-      name: "gcr.io/datadoghq/agent:latest"
-    config:
-      hostPort: 8125
-      collectEvents: true
+  global:
+    credentials:
+      apiSecret:
+        secretName: datadog-secret
+        keyName: api-key
+      appSecret:
+        secretName: datadog-secret
+        keyName: app-key
+  override:
+    nodeAgent:
+      image:
+        name: gcr.io/datadoghq/agent:latest
       tolerations:
         - effect: "NoSchedule"
-          key: xquare/server
+          key: xquare/platform
           operator: "Equal"
           value: "true"
         - effect: "NoSchedule"
-          key: xquare/platform
+          key: xquare/server
           operator: "Equal"
           value: "true"
-      env:
-        - name: DD_DOGSTATSD_NON_LOCAL_TRAFFIC # Java JVM Metrics를 받기 위해 필요
-          value: "true"
-    log:
-      enabled: true
-      logsConfigContainerCollectAll: true
-    apm:
-      enabled: true
-      hostPort: 8126
-    process:
-      enabled: true
-      processCollectionEnabled: true
-    systemProbe:
-      bpfDebugEnabled: true
   features:
-    kubeStateMetricsCore:
-      enabled: true
-    networkMonitoring:
+    apm:
       enabled: true
-  clusterAgent:
-    image:
-      name: "gcr.io/datadoghq/cluster-agent:latest"
-    config:
-      clusterChecksEnabled: true
-    replicas: 2
-  clusterChecksRunner:
-    image:
-      name: "gcr.io/datadoghq/agent:latest
-    replicas: 2
-  clusterName: xquare-cluster
+    logCollection:
+      enabled: true
\ No newline at end of file
diff --git a/charts/datadog/values.yaml b/charts/datadog/values.yaml
index ff888942..cf74ea6a 100644
--- a/charts/datadog/values.yaml
+++ b/charts/datadog/values.yaml
@@ -1,5 +1,6 @@
-installCRDs: false
-
-datadogCRDs:
-  crds:
-    datadogAgents: false
\ No newline at end of file
+datadog:
+  ## Enable apm agent and provide custom configs
+  apm:
+    # datadog.apm.portEnabled -- Enable APM over TCP communication (port 8126 by default)
+    ## ref: https://docs.datadoghq.com/agent/kubernetes/apm/
+    portEnabled: true
\ No newline at end of file