diff --git a/freeleaps/helm-pkg/authentication/templates/authentication/opentelemetry.yaml b/freeleaps/helm-pkg/authentication/templates/authentication/opentelemetry.yaml
index 6964614f..49affade 100644
--- a/freeleaps/helm-pkg/authentication/templates/authentication/opentelemetry.yaml
+++ b/freeleaps/helm-pkg/authentication/templates/authentication/opentelemetry.yaml
@@ -77,11 +77,16 @@ spec:
             statements:
               - set(resource.attributes["application"], "authentication")
               - set(resource.attributes["environment"], "{{ .Values.global.environment | default .Release.Namespace }}")
-              - set(resource.attributes["pod_ip"], resource.attributes["k8s.pod.ip"])
-              - set(resource.attributes["pod_name"], resource.attributes["k8s.pod.name"])
-              - set(resource.attributes["kubernetes_node_name"], resource.attributes["k8s.node.name"])
-              - set(resource.attributes["kubernetes_deployment_name"], resource.attributes["k8s.deployment.name"])
-              - set(resource.attributes["kubernetes_namespace"], resource.attributes["k8s.namespace.name"])
+              - set(resource.attributes["body_json"], ParseJSON(log.body))
+              - set(resource.attributes["body_json"]["kubernetes"]["pod"], resource.attributes["k8s.pod.name"])
+              - set(resource.attributes["body_json"]["kubernetes"]["namespace"], resource.attributes["k8s.namespace.name"])
+              - set(resource.attributes["body_json"]["kubernetes"]["pod_ip"], resource.attributes["k8s.pod.ip"])
+              - set(resource.attributes["body_json"]["kubernetes"]["pod_uid"], resource.attributes["k8s.pod.uid"])
+              - set(resource.attributes["body_json"]["kubernetes"]["deployment"], resource.attributes["k8s.deployment.name"])
+              - set(resource.attributes["body_json"]["kubernetes"]["node"], resource.attributes["k8s.node.name"])
+              - set(resource.attributes["body_json"]["kubernetes"]["namespace"], resource.attributes["k8s.namespace.name"])
+              - set(log.body, resource.attributes["body_json"])
+              - delete_key(resource.attributes, "body_json")
       batch:
         send_batch_size: 5
         timeout: 10s