diff --git a/stacks/observability/grafana.yaml b/stacks/observability/grafana.yaml
index 87746297..1e8b8333 100644
--- a/stacks/observability/grafana.yaml
+++ b/stacks/observability/grafana.yaml
@@ -30,14 +30,14 @@ options:
       datasources:
         - name: Loki
           type: loki
-          url: http://loki:3100
+          url: http://loki.{{ NAMESPACE }}.svc.cluster.local:3100
           access: proxy
           isDefault: false
           jsonData:
             tlsAuthWithCACert: false
         - name: Tempo
           type: tempo
-          url: http://tempo:3100
+          url: http://tempo.{{ NAMESPACE }}.svc.cluster.local:3200
           access: proxy
           isDefault: false
           jsonData:
diff --git a/stacks/observability/opentelemetry-collector-deployment.yaml b/stacks/observability/opentelemetry-collector-deployment.yaml
index f7c6ce2c..a016ebdb 100644
--- a/stacks/observability/opentelemetry-collector-deployment.yaml
+++ b/stacks/observability/opentelemetry-collector-deployment.yaml
@@ -38,15 +38,15 @@ spec:
       debug: {}
         # verbosity: detailed
       otlp/jaeger:
-        endpoint: jaeger-collector:4317
+        endpoint: jaeger.{{ NAMESPACE }}.svc.cluster.local:4317
         tls:
           insecure: true
       otlp/tempo:
-        endpoint: tempo:4317
+        endpoint: tempo.{{ NAMESPACE }}.svc.cluster.local:4317
         tls:
           insecure: true
       otlphttp/loki:
-        endpoint: http://loki:3100/otlp
+        endpoint: http://loki.{{ NAMESPACE }}.svc.cluster.local:3100/otlp
         tls:
           insecure: true
       #     auth:
diff --git a/stacks/observability/opentelemetry-collector-sidecar.yaml b/stacks/observability/opentelemetry-collector-sidecar.yaml
index 80be1944..a28672e0 100644
--- a/stacks/observability/opentelemetry-collector-sidecar.yaml
+++ b/stacks/observability/opentelemetry-collector-sidecar.yaml
@@ -36,15 +36,15 @@ spec:
       debug: {}
         # verbosity: detailed
       otlp/jaeger:
-        endpoint: jaeger-collector:4317
+        endpoint: jaeger.{{ NAMESPACE }}.svc.cluster.local:4317
         tls:
           insecure: true
       otlp/tempo:
-        endpoint: tempo:4317
+        endpoint: tempo.{{ NAMESPACE }}.svc.cluster.local:4317
         tls:
           insecure: true
       otlphttp/loki:
-        endpoint: http://loki:3100/otlp
+        endpoint: http://loki.{{ NAMESPACE }}.svc.cluster.local:3100/otlp
         tls:
           insecure: true
       #     auth: