diff --git a/freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml b/freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml
index 687b5edf..f148ea00 100644
--- a/freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml
+++ b/freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml
@@ -86,11 +86,16 @@ spec:
               - set(resource.attributes["kubernetes_pod_ip"], resource.attributes["k8s.pod.ip"])
               - set(resource.attributes["kubernetes_deployment_name"], resource.attributes["k8s.deployment.name"])
               - set(resource.attributes["kubernetes_namespace"], resource.attributes["k8s.namespace.name"])
-              - set(resource.attributes["log_level"], log.attributes["level"])
-              - set(resource.attributes["log_timestamp"], log.attributes["timestamp"])
-              - set(resource.attributes["log_text"], log.attributes["text"])
-              - set(resource.attributes["log_fields"], log.attributes["fields"])
-              - set(resource.attributes["log_context"], log.attributes["context"])
+              - 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