diff --git a/charts/soteria/templates/deployment.yaml b/charts/soteria/templates/deployment.yaml
index f3ddfb9..230ace4 100644
--- a/charts/soteria/templates/deployment.yaml
+++ b/charts/soteria/templates/deployment.yaml
@@ -67,6 +67,14 @@ spec:
           env:
             - name: TZ
               value: {{ .Values.timezone }}
+            {{ if .Values.tracing.useDaemonset }}
+            - name: SOTERIA_TRACER__ENDPOINT
+              value: $(JAEGER_AGENT_HOST):4317
+            - name: JAEGER_AGENT_HOST
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.hostIP
+            {{ end }}
           volumeMounts:
             - name: configuration
               mountPath: "/app/config.yml"
diff --git a/charts/soteria/values.yaml b/charts/soteria/values.yaml
index 60ef7ec..6aed6a4 100644
--- a/charts/soteria/values.yaml
+++ b/charts/soteria/values.yaml
@@ -1,6 +1,9 @@
 ---
 replicaCount: 1
 
+tracing:
+  useDaemonset: false
+
 labels:
   managedby: cloud-platform-team
   createdby: cloud-platform-team