diff --git a/freeleaps/helm-pkg/chat/templates/chat/opentelemetry.yaml b/freeleaps/helm-pkg/chat/templates/chat/opentelemetry.yaml
index 0879b484..6009089e 100644
--- a/freeleaps/helm-pkg/chat/templates/chat/opentelemetry.yaml
+++ b/freeleaps/helm-pkg/chat/templates/chat/opentelemetry.yaml
@@ -82,7 +82,7 @@ spec:
           - context: log
             statements:
               - set(resource.attributes["application"], "chat")
-              - set(resource.attributes["environment"], "alpha")
+              - 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"])
diff --git a/freeleaps/helm-pkg/chat/values.alpha.yaml b/freeleaps/helm-pkg/chat/values.alpha.yaml
index 0c10855f..03b53f1e 100644
--- a/freeleaps/helm-pkg/chat/values.alpha.yaml
+++ b/freeleaps/helm-pkg/chat/values.alpha.yaml
@@ -1,6 +1,7 @@
 global:
   registry: docker.io
   repository: freeleaps
+  environment: alpha
   nodeSelector: {}
 dashbaord:
   enabled: false
diff --git a/freeleaps/helm-pkg/chat/values.prod.yaml b/freeleaps/helm-pkg/chat/values.prod.yaml
index 429537e4..e2bf2001 100644
--- a/freeleaps/helm-pkg/chat/values.prod.yaml
+++ b/freeleaps/helm-pkg/chat/values.prod.yaml
@@ -1,6 +1,7 @@
 global:
   registry: docker.io
   repository: freeleaps
+  environment: prod
   nodeSelector: {}
 dashboard:
   enabled: true
diff --git a/freeleaps/helm-pkg/chat/values.yaml b/freeleaps/helm-pkg/chat/values.yaml
index f7aeaf5a..6b062ac9 100644
--- a/freeleaps/helm-pkg/chat/values.yaml
+++ b/freeleaps/helm-pkg/chat/values.yaml
@@ -1,6 +1,7 @@
 global:
   registry: docker.io
   repository: freeleaps
+  environment: dev
   nodeSelector: {}
 dashboard:
   enabled: false