diff --git a/kubernetes/eks-prow-build/datadog/kustomization.yaml b/kubernetes/eks-prow-build/datadog/kustomization.yaml
index b42b09693cd..7689710d4d5 100644
--- a/kubernetes/eks-prow-build/datadog/kustomization.yaml
+++ b/kubernetes/eks-prow-build/datadog/kustomization.yaml
@@ -6,7 +6,7 @@ helmCharts:
   - name: datadog
     repo: https://helm.datadoghq.com
     releaseName: datadog
-    version: 3.118.0
+    version: 3.157.3
     kubeVersion: "1.32"
     valuesFile: values.yaml
 
diff --git a/kubernetes/eks-prow-build/datadog/values.yaml b/kubernetes/eks-prow-build/datadog/values.yaml
index 3deaf792f1d..e4b321a4937 100644
--- a/kubernetes/eks-prow-build/datadog/values.yaml
+++ b/kubernetes/eks-prow-build/datadog/values.yaml
@@ -24,6 +24,17 @@ datadog:
       uncompressedLayersSupport: true
     host:
       enabled: true
+  operator:
+    enabled: false
+  kubernetesResourcesLabelsAsTags:
+    nodes:
+      kubernetes.io/arch: kubernetes.io/arch
+    pods:
+      prow.k8s.io/refs.org: prow.k8s.io/refs.org
+      prow.k8s.io/refs.repo: prow.k8s.io/refs.repo
+      prow.k8s.io/type: prow.k8s.io/type
+      prow.k8s.io/job: prow.k8s.io/job
+      prow.k8s.io/id: prow.k8s.io/id
 clusterAgent:
   tokenExistingSecret: datadog-secret
 agents:
diff --git a/kubernetes/eks-prow-kops/datadog/kustomization.yaml b/kubernetes/eks-prow-kops/datadog/kustomization.yaml
index 436ad0a37dd..e3bbb0b45c0 100644
--- a/kubernetes/eks-prow-kops/datadog/kustomization.yaml
+++ b/kubernetes/eks-prow-kops/datadog/kustomization.yaml
@@ -6,7 +6,7 @@ helmCharts:
   - name: datadog
     repo: https://helm.datadoghq.com
     releaseName: datadog
-    version: 3.157.0
+    version: 3.157.3
     kubeVersion: "1.30"
     valuesFile: values.yaml
 
diff --git a/kubernetes/eks-prow-kops/datadog/values.yaml b/kubernetes/eks-prow-kops/datadog/values.yaml
index 10d098890e6..9e202ef10c0 100644
--- a/kubernetes/eks-prow-kops/datadog/values.yaml
+++ b/kubernetes/eks-prow-kops/datadog/values.yaml
@@ -27,6 +27,17 @@ datadog:
   apm:
     instrumentation:
       skipKPITelemetry: true # https://github.com/DataDog/helm-charts/issues/1395
+  operator:
+    enabled: false
+  kubernetesResourcesLabelsAsTags:
+    nodes:
+      kubernetes.io/arch: kubernetes.io/arch
+    pods:
+      prow.k8s.io/refs.org: prow.k8s.io/refs.org
+      prow.k8s.io/refs.repo: prow.k8s.io/refs.repo
+      prow.k8s.io/type: prow.k8s.io/type
+      prow.k8s.io/job: prow.k8s.io/job
+      prow.k8s.io/id: prow.k8s.io/id
 clusterAgent:
   tokenExistingSecret: datadog-secret
 agents:
diff --git a/kubernetes/gke-aaa/datadog/kustomization.yaml b/kubernetes/gke-aaa/datadog/kustomization.yaml
index d6fa25eb9e8..7665516791c 100644
--- a/kubernetes/gke-aaa/datadog/kustomization.yaml
+++ b/kubernetes/gke-aaa/datadog/kustomization.yaml
@@ -6,7 +6,7 @@ helmCharts:
   - name: datadog
     repo: https://helm.datadoghq.com
     releaseName: datadog
-    version: 3.118.0
+    version: 3.157.3
     valuesFile: values.yaml
 
 resources:
diff --git a/kubernetes/gke-aaa/datadog/values.yaml b/kubernetes/gke-aaa/datadog/values.yaml
index fdde354d46e..2da19c112b0 100644
--- a/kubernetes/gke-aaa/datadog/values.yaml
+++ b/kubernetes/gke-aaa/datadog/values.yaml
@@ -30,6 +30,8 @@ datadog:
   apm:
     instrumentation:
       skipKPITelemetry: true # https://github.com/DataDog/helm-charts/issues/1395
+  operator:
+    enabled: false
 clusterAgent:
   tokenExistingSecret: datadog-secret
 agents:
diff --git a/kubernetes/gke-prow-build-trusted/datadog/kustomization.yaml b/kubernetes/gke-prow-build-trusted/datadog/kustomization.yaml
index fe7c2834574..7665516791c 100644
--- a/kubernetes/gke-prow-build-trusted/datadog/kustomization.yaml
+++ b/kubernetes/gke-prow-build-trusted/datadog/kustomization.yaml
@@ -6,7 +6,7 @@ helmCharts:
   - name: datadog
     repo: https://helm.datadoghq.com
     releaseName: datadog
-    version: 3.135.4
+    version: 3.157.3
     valuesFile: values.yaml
 
 resources:
diff --git a/kubernetes/gke-prow-build-trusted/datadog/values.yaml b/kubernetes/gke-prow-build-trusted/datadog/values.yaml
index 90c837774ea..a28c13bacc9 100644
--- a/kubernetes/gke-prow-build-trusted/datadog/values.yaml
+++ b/kubernetes/gke-prow-build-trusted/datadog/values.yaml
@@ -27,6 +27,17 @@ datadog:
   apm:
     instrumentation:
       skipKPITelemetry: true # https://github.com/DataDog/helm-charts/issues/1395
+  operator:
+    enabled: false
+  kubernetesResourcesLabelsAsTags:
+    nodes:
+      kubernetes.io/arch: kubernetes.io/arch
+    pods:
+      prow.k8s.io/refs.org: prow.k8s.io/refs.org
+      prow.k8s.io/refs.repo: prow.k8s.io/refs.repo
+      prow.k8s.io/type: prow.k8s.io/type
+      prow.k8s.io/job: prow.k8s.io/job
+      prow.k8s.io/id: prow.k8s.io/id
 clusterAgent:
   tokenExistingSecret: datadog-secret
 agents:
diff --git a/kubernetes/gke-prow-build/datadog/kustomization.yaml b/kubernetes/gke-prow-build/datadog/kustomization.yaml
index fe7c2834574..7665516791c 100644
--- a/kubernetes/gke-prow-build/datadog/kustomization.yaml
+++ b/kubernetes/gke-prow-build/datadog/kustomization.yaml
@@ -6,7 +6,7 @@ helmCharts:
   - name: datadog
     repo: https://helm.datadoghq.com
     releaseName: datadog
-    version: 3.135.4
+    version: 3.157.3
     valuesFile: values.yaml
 
 resources:
diff --git a/kubernetes/gke-prow-build/datadog/values.yaml b/kubernetes/gke-prow-build/datadog/values.yaml
index d203e30f901..4fbb7986128 100644
--- a/kubernetes/gke-prow-build/datadog/values.yaml
+++ b/kubernetes/gke-prow-build/datadog/values.yaml
@@ -30,6 +30,17 @@ datadog:
   apm:
     instrumentation:
       skipKPITelemetry: true # https://github.com/DataDog/helm-charts/issues/1395
+  operator:
+    enabled: false
+  kubernetesResourcesLabelsAsTags:
+    nodes:
+      kubernetes.io/arch: kubernetes.io/arch
+    pods:
+      prow.k8s.io/refs.org: prow.k8s.io/refs.org
+      prow.k8s.io/refs.repo: prow.k8s.io/refs.repo
+      prow.k8s.io/type: prow.k8s.io/type
+      prow.k8s.io/job: prow.k8s.io/job
+      prow.k8s.io/id: prow.k8s.io/id
 clusterAgent:
   tokenExistingSecret: datadog-secret
 agents:
diff --git a/kubernetes/gke-prow/datadog/kustomization.yaml b/kubernetes/gke-prow/datadog/kustomization.yaml
index fe7c2834574..7665516791c 100644
--- a/kubernetes/gke-prow/datadog/kustomization.yaml
+++ b/kubernetes/gke-prow/datadog/kustomization.yaml
@@ -6,7 +6,7 @@ helmCharts:
   - name: datadog
     repo: https://helm.datadoghq.com
     releaseName: datadog
-    version: 3.135.4
+    version: 3.157.3
     valuesFile: values.yaml
 
 resources:
diff --git a/kubernetes/gke-prow/datadog/values.yaml b/kubernetes/gke-prow/datadog/values.yaml
index e316bb07f6a..dda0486bf3f 100644
--- a/kubernetes/gke-prow/datadog/values.yaml
+++ b/kubernetes/gke-prow/datadog/values.yaml
@@ -30,6 +30,8 @@ datadog:
   apm:
     instrumentation:
       skipKPITelemetry: true # https://github.com/DataDog/helm-charts/issues/1395
+  operator:
+    enabled: false
 clusterAgent:
   tokenExistingSecret: datadog-secret
 agents:
diff --git a/kubernetes/gke-utility/datadog/kustomization.yaml b/kubernetes/gke-utility/datadog/kustomization.yaml
index fe7c2834574..7665516791c 100644
--- a/kubernetes/gke-utility/datadog/kustomization.yaml
+++ b/kubernetes/gke-utility/datadog/kustomization.yaml
@@ -6,7 +6,7 @@ helmCharts:
   - name: datadog
     repo: https://helm.datadoghq.com
     releaseName: datadog
-    version: 3.135.4
+    version: 3.157.3
     valuesFile: values.yaml
 
 resources:
diff --git a/kubernetes/gke-utility/datadog/values.yaml b/kubernetes/gke-utility/datadog/values.yaml
index c08395edea5..d4c03b7fba3 100644
--- a/kubernetes/gke-utility/datadog/values.yaml
+++ b/kubernetes/gke-utility/datadog/values.yaml
@@ -30,6 +30,8 @@ datadog:
   apm:
     instrumentation:
       skipKPITelemetry: true # https://github.com/DataDog/helm-charts/issues/1395
+  operator:
+    enabled: false
 clusterAgent:
   tokenExistingSecret: datadog-secret
 agents: