diff --git a/freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml b/freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml
index 49add631..44712e4c 100644
--- a/freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml
+++ b/freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml
@@ -82,7 +82,8 @@ spec:
           - context: log
             statements:
               - set(resource.attributes["application"], log.attributes["context"]["app"])
-              - set(resource.attributes["environment"], log.attributes["context"]["env"])
+              - set(resource.attributes["service_name"], "devsvc")
+              - 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/devsvc/values.alpha.yaml b/freeleaps/helm-pkg/devsvc/values.alpha.yaml
index 967ce569..4785745e 100644
--- a/freeleaps/helm-pkg/devsvc/values.alpha.yaml
+++ b/freeleaps/helm-pkg/devsvc/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/devsvc/values.prod.yaml b/freeleaps/helm-pkg/devsvc/values.prod.yaml
index 91d81cd3..c1df4992 100644
--- a/freeleaps/helm-pkg/devsvc/values.prod.yaml
+++ b/freeleaps/helm-pkg/devsvc/values.prod.yaml
@@ -1,6 +1,7 @@
 global:
   registry: docker.io
   repository: freeleaps
+  environment: prod
   nodeSelector: {}
 dashboard:
   enabled: true