diff --git a/freeleaps/helm-pkg/freeleaps/templates/freeleaps/opentelemetry.yaml b/freeleaps/helm-pkg/freeleaps/templates/freeleaps/opentelemetry.yaml
index ba1bcf9b..cefae709 100644
--- a/freeleaps/helm-pkg/freeleaps/templates/freeleaps/opentelemetry.yaml
+++ b/freeleaps/helm-pkg/freeleaps/templates/freeleaps/opentelemetry.yaml
@@ -53,6 +53,9 @@ spec:
           - type: json_parser
             parse_from: body
             parse_to: attributes
+          - type: move
+            from: attributes.text
+            to: body
     processors:
       resource:
         attributes:
@@ -78,23 +81,13 @@ spec:
         log_statements:
           - context: log
             statements:
-              - set(resource.attributes["application"], log.attributes["context"]["app"])
-              - set(resource.attributes["environment"], log.attributes["context"]["env"])
+              - set(resource.attributes["application"], "freeleaps")
+              - set(resource.attributes["environment"], "{{ .Values.global.environment | default .Release.Namespace }}")
               - set(resource.attributes["kubernetes_node_name"], resource.attributes["k8s.node.name"])
               - set(resource.attributes["kubernetes_pod_name"], resource.attributes["k8s.pod.name"])
               - 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["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  
diff --git a/freeleaps/helm-pkg/freeleaps/values.alpha.yaml b/freeleaps/helm-pkg/freeleaps/values.alpha.yaml
index 375e3f36..1a3592a1 100644
--- a/freeleaps/helm-pkg/freeleaps/values.alpha.yaml
+++ b/freeleaps/helm-pkg/freeleaps/values.alpha.yaml
@@ -1,6 +1,7 @@
 global:
   registry: docker.io
   repository: freeleaps
+  environment: alpha
   nodeSelector: {}
 dashboard:
   enabled: false
diff --git a/freeleaps/helm-pkg/freeleaps/values.prod.yaml b/freeleaps/helm-pkg/freeleaps/values.prod.yaml
index bb1521b4..730c1643 100644
--- a/freeleaps/helm-pkg/freeleaps/values.prod.yaml
+++ b/freeleaps/helm-pkg/freeleaps/values.prod.yaml
@@ -1,6 +1,7 @@
 global:
   registry: docker.io
   repository: freeleaps
+  environment: prod
   nodeSelector: {}
 dashboard:
   enabled: true
@@ -67,7 +68,7 @@ freeleaps:
     freeleapsAuthenticationEndpoint: http://authentication-service.freeleaps-prod.svc.freeleaps.cluster:8004/api/auth/
     freeleapsNotificationEndpoint: http://notification-service.freeleaps-prod.svc.freeleaps.cluster:8003/api/notification/
     freeleapsAilabEndpoint: ''
-    freeleapsEnv: alpha
+    freeleapsEnv: prod
     certPath: ''
     redisUrl: redis://:izrZtCmYk8@freeleaps-prod-redis-redis-cluster-headless.freeleaps-prod.svc.freeleaps.cluster:6379/0
     redisIsCluster: 'true'
diff --git a/freeleaps/helm-pkg/freeleaps/values.yaml b/freeleaps/helm-pkg/freeleaps/values.yaml
index 18b14e9a..75edc4e9 100644
--- a/freeleaps/helm-pkg/freeleaps/values.yaml
+++ b/freeleaps/helm-pkg/freeleaps/values.yaml
@@ -1,6 +1,7 @@
 global:
   registry: docker.io
   repository: freeleaps
+  environment: dev
   nodeSelector: {}
 dashboard:
   enabled: false