diff --git a/roles/alpina/templates/services/minio/docker-compose.yml.j2 b/roles/alpina/templates/services/minio/docker-compose.yml.j2
index 8690cb1..9e68148 100644
--- a/roles/alpina/templates/services/minio/docker-compose.yml.j2
+++ b/roles/alpina/templates/services/minio/docker-compose.yml.j2
@@ -13,7 +13,7 @@ services:
       - {{ helpers.traefik_labels('minio', port='9090') | indent(6) }}
       - traefik.http.routers.minio.service=minio
       - traefik.http.routers.minio-tls.service=minio
-      - traefik.http.routers.minio-s3.rule=HostRegexp(`s3.{{ domain }}`, `{subdomain:.+}.s3.{{ domain }}`)
+      - traefik.http.routers.minio-s3.rule=Host(`s3.{{ domain }}`) || HostRegexp(`^.+[.]s3[.]{{ domain }}`)
       - traefik.http.routers.minio-s3.entrypoints=websecure
       - traefik.http.routers.minio-s3.tls=true
       - traefik.http.routers.minio-s3.tls.certresolver=letsencrypt
diff --git a/roles/alpina/templates/services/monitoring/docker-compose.yml.j2 b/roles/alpina/templates/services/monitoring/docker-compose.yml.j2
index cb626d2..ed25e16 100644
--- a/roles/alpina/templates/services/monitoring/docker-compose.yml.j2
+++ b/roles/alpina/templates/services/monitoring/docker-compose.yml.j2
@@ -103,9 +103,11 @@ services:
     image: jaegertracing/all-in-one:1
     container_name: jaeger
     restart: unless-stopped
+    environment:
+      - COLLECTOR_OTLP_ENABLED=true
     ports:
-      - 5778:5778
-      - 6831:6831/udp
+      - 4317:4317
+      - 4318:4318
     volumes:
       - {{ base_volume_path }}/monitoring/jaeger:/jaeger
 
diff --git a/roles/alpina/templates/services/traefik/docker-compose.yml.j2 b/roles/alpina/templates/services/traefik/docker-compose.yml.j2
index 580ccf4..018992f 100644
--- a/roles/alpina/templates/services/traefik/docker-compose.yml.j2
+++ b/roles/alpina/templates/services/traefik/docker-compose.yml.j2
@@ -12,7 +12,7 @@ networks:
 
 services:
   traefik:
-    image: traefik:v2.10
+    image: traefik:v3.0
     container_name: traefik
     restart: unless-stopped
     env_file:
diff --git a/roles/alpina/templates/services/traefik/traefik.yml.j2 b/roles/alpina/templates/services/traefik/traefik.yml.j2
index 2a7819c..396f1d3 100644
--- a/roles/alpina/templates/services/traefik/traefik.yml.j2
+++ b/roles/alpina/templates/services/traefik/traefik.yml.j2
@@ -8,9 +8,6 @@ accessLog:
   filePath: /logs/access.log
   bufferingSize: 100
 
-experimental:
-  http3: true
-
 entryPoints:
   web:
     address: ":80"
@@ -26,8 +23,10 @@ metrics:
     entryPoint: metrics
 
 tracing:
-  jaeger:
-    samplingServerURL: http://localhost:5778/sampling
+  otlp:
+    grpc:
+      endpoint: "localhost:4317"
+      insecure: true
 
 certificatesResolvers:
   letsencrypt: