diff --git a/cluster/manifests/freeleaps-logging-system/loki/values.yaml b/cluster/manifests/freeleaps-logging-system/loki/values.yaml
index fbd4c0e9..c515c807 100644
--- a/cluster/manifests/freeleaps-logging-system/loki/values.yaml
+++ b/cluster/manifests/freeleaps-logging-system/loki/values.yaml
@@ -352,12 +352,9 @@ loki:
       resource_attributes:
         attributes_config:
           - action: index_label
-            attributes:
-              - app
-              - env
-              - k8s.pod.name
-              - k8s.namespace.name
-              - k8s.node.name
+            regex: app
+          - action: index_label
+            regex: environment
   # -- Provides a reloadable runtime configuration file for some specific configuration
   runtimeConfig: {}
   # -- Check https://grafana.com/docs/loki/latest/configuration/#common_config for more info on how to provide a common configuration
diff --git a/freeleaps/helm-pkg/authentication/templates/authentication/opentelemetry.yaml b/freeleaps/helm-pkg/authentication/templates/authentication/opentelemetry.yaml
index e51e9848..9e0a8eea 100644
--- a/freeleaps/helm-pkg/authentication/templates/authentication/opentelemetry.yaml
+++ b/freeleaps/helm-pkg/authentication/templates/authentication/opentelemetry.yaml
@@ -48,8 +48,8 @@ spec:
           - context: log
             statements:
               - set(log.body["kubernetes"], log.attributes["kubernetes"])
-              - set(log.attributes["app"], log.attributes["context"]["app"])
-              - set(log.attributes["environment"], log.attributes["context"]["env"])
+              - set(log.attributes["service.name"], log.attributes["context"]["app"])
+              - set(log.attributes["deployment.environment"], log.attributes["context"]["env"])
       batch:
         send_batch_size: 5
         timeout: 10s