diff --git a/examples/extras/datadog-agent/main.tf b/examples/extras/datadog-agent/main.tf
index 8ea479c..7d4a9d2 100644
--- a/examples/extras/datadog-agent/main.tf
+++ b/examples/extras/datadog-agent/main.tf
@@ -36,11 +36,10 @@ resource "helm_release" "datadog" {
   depends_on = [module.images, kubernetes_namespace.namespace]
 
   values = [
-    file("datadog.values.yml"),
-    #    templatefile("${path.root}/templates/fluentbit.env.yml.tpl", {
-    #      region       = local.region
-    #      cluster_name = var.cluster_name
-    #    })
+    templatefile("datadog.values.yml.tpl", {
+      datadog_env      = local.datadog_env
+      clusteragent_env = local.clusteragent_env
+    })
   ]
 
   set_sensitive {
@@ -58,6 +57,11 @@ resource "helm_release" "datadog" {
     value = local.datadog_site
   }
 
+  set {
+    name  = "datadog.clusterName"
+    value = var.cluster_name
+  }
+
   ##   set {
   ##     name  = "datadog.dd_url"
   ##     value = var.datadog_site_url