diff --git a/HelmChart/Public/kubernetes-agent/templates/configmap-daemonset.yaml b/HelmChart/Public/kubernetes-agent/templates/configmap-daemonset.yaml
index a87cff9018..e336e426d7 100644
--- a/HelmChart/Public/kubernetes-agent/templates/configmap-daemonset.yaml
+++ b/HelmChart/Public/kubernetes-agent/templates/configmap-daemonset.yaml
@@ -17,7 +17,7 @@ data:
       kubeletstats:
         collection_interval: {{ .Values.collectionInterval }}
         auth_type: serviceAccount
-        endpoint: "https://${env:NODE_NAME}:10250"
+        endpoint: "https://${env:NODE_IP}:10250"
         insecure_skip_verify: true
         metric_groups:
           - node
diff --git a/HelmChart/Public/kubernetes-agent/templates/daemonset.yaml b/HelmChart/Public/kubernetes-agent/templates/daemonset.yaml
index e6f6d8bcb6..b935a16c97 100644
--- a/HelmChart/Public/kubernetes-agent/templates/daemonset.yaml
+++ b/HelmChart/Public/kubernetes-agent/templates/daemonset.yaml
@@ -34,6 +34,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
+            - name: NODE_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.hostIP
             - name: ONEUPTIME_API_KEY
               valueFrom:
                 secretKeyRef: