diff --git a/charts/wonderwall-forward-auth/Feature.yaml b/charts/wonderwall-forward-auth/Feature.yaml
index 217c927..ba42caa 100644
--- a/charts/wonderwall-forward-auth/Feature.yaml
+++ b/charts/wonderwall-forward-auth/Feature.yaml
@@ -22,6 +22,9 @@ values:
     computed:
       template: |
         "urn:zitadel:iam:org:id:{{ .Env.zitadel_organization_id }}"
+  otel.endpoint:
+    computed:
+      template: '"{{ .Env.otel_otlp_endpoint }}"'
   replicas.min:
     config:
       type: int
diff --git a/charts/wonderwall-forward-auth/values.yaml b/charts/wonderwall-forward-auth/values.yaml
index 7015668..0fb863e 100644
--- a/charts/wonderwall-forward-auth/values.yaml
+++ b/charts/wonderwall-forward-auth/values.yaml
@@ -28,7 +28,8 @@ ingressClassName: external-fa-haproxy
 additionalIngressClassNames:
   - nais-ingress-fa
 otel:
-  endpoint: http://opentelemetry-management-collector.nais-system:4317
+  # mapped by fasit
+  endpoint:
 
 openid:
   clientID:
diff --git a/charts/wonderwall/Feature.yaml b/charts/wonderwall/Feature.yaml
index b8ab412..a9546b2 100644
--- a/charts/wonderwall/Feature.yaml
+++ b/charts/wonderwall/Feature.yaml
@@ -103,6 +103,9 @@ values:
     description: Well-known URL to generic identity provider. Optional. Only needed if a default global provider is desired.
     config:
       type: string
+  otel.endpoint:
+    computed:
+      template: '"{{ .Env.otel_otlp_endpoint }}"'
   resourceSuffix:
     description: Suffix for resources that may conflict in parallel environments.
     config:
diff --git a/charts/wonderwall/values.yaml b/charts/wonderwall/values.yaml
index 9a464c5..1e43f4f 100644
--- a/charts/wonderwall/values.yaml
+++ b/charts/wonderwall/values.yaml
@@ -87,4 +87,5 @@ resourceSuffix: ""
 podDisruptionBudget:
   maxUnavailable: 1
 otel:
-  endpoint: http://opentelemetry-collector.nais-system:4317
+  # mapped by fasit
+  endpoint: