diff --git a/group_vars/stage_dev/plain.yml b/group_vars/stage_dev/plain.yml
index ba885ce..0c54b99 100644
--- a/group_vars/stage_dev/plain.yml
+++ b/group_vars/stage_dev/plain.yml
@@ -160,6 +160,7 @@ shared_service_redis_hostname: "{{ stage }}-redis-01.{{ domain }}"
 shared_service_kube_argocd_hostname: "{{ stage }}-kube-argocd.{{ domain }}"
 shared_service_kube_awx_hostname: "{{ stage }}-kube-awx.{{ domain }}"
 shared_service_kube_prometheus_hostname: "{{ stage }}-kube-prometheus.{{ domain }}"
+shared_service_kube_jaeger_collector_hostname: "{{ stage }}-kube-jaeger-collector.{{ domain }}"
 shared_service_pdns_hostname: "{{ stage }}-pdns-01.{{ domain }}"
 shared_service_webdav_hostname: "{{ stage }}-webdav-01.{{ domain }}"
 shared_service_keycloak_hostname: "{{ stage }}-keycloak-01.{{ domain }}"
@@ -266,6 +267,10 @@ shared_service_hosts: [
     ip: "{{ shared_service_kube_ip }}",
     name: "{{ shared_service_kube_prometheus_hostname }}"
   },
+  {
+    ip: "{{ shared_service_kube_ip }}",
+    name: "{{ shared_service_kube_jaeger_collector_hostname }}"
+  },
   {
     ip: "{{ shared_service_management_ip }}",
     name: "{{ management_service_connect_hostname }}"
diff --git a/group_vars/stage_prodnso/plain.yml b/group_vars/stage_prodnso/plain.yml
index 450507c..29d70f1 100644
--- a/group_vars/stage_prodnso/plain.yml
+++ b/group_vars/stage_prodnso/plain.yml
@@ -130,6 +130,12 @@ shared_service_kube_node_03: "{{ stage_server_infos
   | list
   | first
   | default('-') }}"
+shared_service_management_ip: "{{ stage_server_infos
+  | selectattr('name', 'match', stage + '-management-01' )
+  | map(attribute='private_ip')
+  | list
+  | first
+  | default('-') }}"
 
 prometheus_federation_enabled: false
 shared_service_kube_ip: "{{ stage_private_ingress_loadbalancer_ip | default('-') }}"
@@ -155,6 +161,7 @@ shared_service_redis_hostname: "{{ stage }}-redis-01.{{ domain }}"
 shared_service_kube_argocd_hostname: "{{ stage }}-kube-argocd.{{ domain }}"
 shared_service_kube_awx_hostname: "{{ stage }}-awx-01.{{ domain }}"
 shared_service_kube_prometheus_hostname: "{{ stage }}-kube-prometheus.{{ domain }}"
+shared_service_kube_jaeger_collector_hostname: "{{ stage }}-kube-jaeger-collector.{{ domain }}"
 shared_service_pdns_hostname: "{{ stage }}-pdns-01.{{ domain }}"
 shared_service_webdav_hostname: "{{ stage }}-webdav-01.{{ domain }}"
 shared_service_keycloak_hostname: "{{ stage }}-keycloak-01.{{ domain }}"
@@ -249,9 +256,25 @@ shared_service_hosts: [
     ip: "{{ shared_service_pdns_ip }}",
     name: "{{ shared_service_pdns_hostname }}"
   },
+  {
+    ip: "{{ shared_service_kube_ip }}",
+    name: "{{ shared_service_kube_argocd_hostname }}"
+  },
+  {
+    ip: "{{ shared_service_kube_ip }}",
+    name: "{{ shared_service_kube_awx_hostname }}"
+  },
   {
     ip: "{{ shared_service_kube_ip }}",
     name: "{{ shared_service_kube_prometheus_hostname }}"
+  },
+  {
+    ip: "{{ shared_service_kube_ip }}",
+    name: "{{ shared_service_kube_jaeger_collector_hostname }}"
+  },
+  {
+    ip: "{{ shared_service_management_ip }}",
+    name: "{{ management_service_connect_hostname }}"
   }
 ]
 
diff --git a/group_vars/stage_qa/plain.yml b/group_vars/stage_qa/plain.yml
index 1ff995e..8365ed5 100644
--- a/group_vars/stage_qa/plain.yml
+++ b/group_vars/stage_qa/plain.yml
@@ -160,6 +160,7 @@ shared_service_redis_hostname: "{{ stage }}-redis-01.{{ domain }}"
 shared_service_kube_argocd_hostname: "{{ stage }}-kube-argocd.{{ domain }}"
 shared_service_kube_awx_hostname: "{{ stage }}-kube-awx.{{ domain }}"
 shared_service_kube_prometheus_hostname: "{{ stage }}-kube-prometheus.{{ domain }}"
+shared_service_kube_jaeger_collector_hostname: "{{ stage }}-kube-jaeger-collector.{{ domain }}"
 shared_service_pdns_hostname: "{{ stage }}-pdns-01.{{ domain }}"
 shared_service_webdav_hostname: "{{ stage }}-webdav-01.{{ domain }}"
 shared_service_keycloak_hostname: "{{ stage }}-keycloak-01.{{ domain }}"
@@ -266,6 +267,10 @@ shared_service_hosts: [
     ip: "{{ shared_service_kube_ip }}",
     name: "{{ shared_service_kube_prometheus_hostname }}"
   },
+  {
+    ip: "{{ shared_service_kube_ip }}",
+    name: "{{ shared_service_kube_jaeger_collector_hostname }}"
+  },
   {
     ip: "{{ shared_service_management_ip }}",
     name: "{{ management_service_connect_hostname }}"
diff --git a/roles/kubernetes/argocd/defaults/main.yml b/roles/kubernetes/argocd/defaults/main.yml
index c800de5..d08a0f9 100644
--- a/roles/kubernetes/argocd/defaults/main.yml
+++ b/roles/kubernetes/argocd/defaults/main.yml
@@ -197,6 +197,40 @@ k8s_argocd_helm__release_values:
           selfHeal: true
         syncOptions:
         - CreateNamespace=true
+    -
+      name: jaeger-operator
+      namespace: '{{ k8s_argocd_helm__release_namespace }}'
+      destination:
+        namespace: observability
+        server: https://kubernetes.default.svc
+      project: infrastructure
+      source:
+        path: config/default
+        repoURL: https://{{ shared_service_gitea_hostname }}/argocd/jaeger-operator
+        targetRevision: v1.31.0
+      syncPolicy:
+        automated:
+          prune: true
+          selfHeal: true
+        syncOptions:
+        - CreateNamespace=true
+    -
+      name: jaeger
+      namespace: '{{ k8s_argocd_helm__release_namespace }}'
+      destination:
+        namespace: jaeger
+        server: https://kubernetes.default.svc
+      project: infrastructure
+      source:
+        path: apps/{{ stage }}/jaeger
+        repoURL: https://{{ shared_service_gitea_hostname }}/gitea-admin/argocd.git
+        targetRevision: HEAD
+      syncPolicy:
+        automated:
+          prune: true
+          selfHeal: true
+        syncOptions:
+        - CreateNamespace=true
   dex:
     enabled: false
   redis:
diff --git a/roles/traefik/vars/main.yml b/roles/traefik/vars/main.yml
index dc8f85f..a412b67 100644
--- a/roles/traefik/vars/main.yml
+++ b/roles/traefik/vars/main.yml
@@ -65,10 +65,6 @@ traefik_docker: {
           internal: "{{ monitor_port_harbor }}"
         },
       ],
-      dns: [
-        '"8.8.8.8"',
-        '"8.8.8.4"',
-      ],
     }
   ]
 }
diff --git a/templates/traefik/traefik.toml.j2 b/templates/traefik/traefik.toml.j2
index 119e075..914cef7 100644
--- a/templates/traefik/traefik.toml.j2
+++ b/templates/traefik/traefik.toml.j2
@@ -15,9 +15,6 @@
 #    "ClientPort" = "drop"
     "ClientUsername" = "drop"
 
-[api]
-  dashboard = true
-
 [metrics]
   [metrics.prometheus]
     manualRouting = true
@@ -26,6 +23,14 @@
     buckets = [0.1,0.3,1.2,5.0]
     entryPoint = "admin-service"
 
+#[tracing]
+#  serviceName = "{{ traefik_id }}"
+#  [tracing.jaeger.collector]
+#    endpoint = "http://{{ shared_service_kube_jaeger_collector_hostname | default('127.0.0.1') }}:80/api/traces"
+
+[api]
+  dashboard = true
+
 [entryPoints]
   ### http -> https ###
   [entryPoints.web]