diff --git a/.idea/jsonSchemas.xml b/.idea/jsonSchemas.xml
index 3caa14c..cc8314e 100644
--- a/.idea/jsonSchemas.xml
+++ b/.idea/jsonSchemas.xml
@@ -71,6 +71,9 @@
                   <Item>
                     <option name="path" value="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_1.yml" />
                   </Item>
+                  <Item>
+                    <option name="path" value="file:///run/user/1000/kio-fuse-kipURF/sftp/root@debbi.lab.home/mnt/dock/traefik/rules/hello-world.yml" />
+                  </Item>
                 </list>
               </option>
             </SchemaInfo>
diff --git a/roles/alpina/collections/services/monitoring/templates/docker-compose.yml.j2 b/roles/alpina/collections/services/monitoring/templates/docker-compose.yml.j2
index 52de078..db2ef96 100644
--- a/roles/alpina/collections/services/monitoring/templates/docker-compose.yml.j2
+++ b/roles/alpina/collections/services/monitoring/templates/docker-compose.yml.j2
@@ -78,3 +78,13 @@ services:
       - traefik_traefik
     volumes:
       - {{ base_volume_path }}/monitoring/influxdb:/var/lib/influxdb2
+
+  jaeger:
+    image: jaegertracing/all-in-one:1
+    container_name: jaeger
+    restart: unless-stopped
+    ports:
+      - 5778:5778
+      - 6831:6831/udp
+    volumes:
+      - {{ base_volume_path }}/monitoring/jaeger:/jaeger
diff --git a/roles/alpina/collections/services/monitoring/templates/grafana_config/provisioning/datasources/alpina.yaml.j2 b/roles/alpina/collections/services/monitoring/templates/grafana_config/provisioning/datasources/alpina.yaml.j2
index 2ce42bf..44f9f2a 100644
--- a/roles/alpina/collections/services/monitoring/templates/grafana_config/provisioning/datasources/alpina.yaml.j2
+++ b/roles/alpina/collections/services/monitoring/templates/grafana_config/provisioning/datasources/alpina.yaml.j2
@@ -27,3 +27,20 @@ datasources:
     secureJsonData:
       token: {{ influxdb_admin_token }}
     editable: false
+
+  - name: Jaeger
+    type: jaeger
+    access: proxy
+    uid: jaeger
+    url: http://jaeger:16686
+    editable: false
+    jsonData:
+      tracesToLogsV2:
+        datasourceUid: loki
+        spanStartTimeShift: 1h
+        spanEndTimeShift: -1h
+        tags: []
+        filterByTraceID: false
+        filterBySpanID: false
+        customQuery: true
+        query: '{container_name=~".*$${__span.tags["traefik.service.name"]}.*"}'
diff --git a/roles/alpina/collections/services/traefik/templates/docker-compose.yml.j2 b/roles/alpina/collections/services/traefik/templates/docker-compose.yml.j2
index 346df79..d6610d8 100644
--- a/roles/alpina/collections/services/traefik/templates/docker-compose.yml.j2
+++ b/roles/alpina/collections/services/traefik/templates/docker-compose.yml.j2
@@ -13,7 +13,7 @@ networks:
 
 services:
   traefik:
-    image: traefik:v2.9
+    image: traefik:v2.10
     container_name: traefik
     restart: unless-stopped
     env_file:
diff --git a/roles/alpina/collections/services/traefik/templates/traefik.yml.j2 b/roles/alpina/collections/services/traefik/templates/traefik.yml.j2
index 7b5ba98..2a7819c 100644
--- a/roles/alpina/collections/services/traefik/templates/traefik.yml.j2
+++ b/roles/alpina/collections/services/traefik/templates/traefik.yml.j2
@@ -25,6 +25,10 @@ metrics:
   prometheus:
     entryPoint: metrics
 
+tracing:
+  jaeger:
+    samplingServerURL: http://localhost:5778/sampling
+
 certificatesResolvers:
   letsencrypt:
     acme: