diff --git a/docker/docker-compose-grafana.yml b/docker/docker-compose-grafana.yml
index df298fac..1bd424e1 100644
--- a/docker/docker-compose-grafana.yml
+++ b/docker/docker-compose-grafana.yml
@@ -21,7 +21,7 @@ services:
     labels:
       - traefik.enable=true
       - traefik.http.routers.grafana.rule=PathPrefix(`/grafana`)
-      - traefik.http.routers.grafana.middlewares=console-auth-headers,grafana-avatar
+      - traefik.http.routers.grafana.middlewares=console-auth,grafana-avatar
       - traefik.http.middlewares.grafana-avatar.redirectRegex.regex=^(https?://.+)/grafana/avatar/.+
       - traefik.http.middlewares.grafana-avatar.redirectRegex.replacement=$${1}/api/v0/console/user/avatar
       - metrics.port=3000
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 3208eec5..8f717d84 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -133,11 +133,11 @@ services:
       # For anything else...
       - "traefik.http.routers.akvorado-console.rule=!PathPrefix(`/debug`)"
       - traefik.http.routers.akvorado-console.priority=1
-      - traefik.http.routers.akvorado-console.middlewares=console-auth-headers
+      - traefik.http.routers.akvorado-console.middlewares=console-auth
       - traefik.http.services.akvorado-console.loadbalancer.server.port=8080
-      - traefik.http.middlewares.console-auth-headers.headers.customrequestheaders.Remote-User=alfred
-      - traefik.http.middlewares.console-auth-headers.headers.customrequestheaders.Remote-Name=Alfred Pennyworth
-      - traefik.http.middlewares.console-auth-headers.headers.customrequestheaders.Remote-Email=alfred@example.com
+      - traefik.http.middlewares.console-auth.headers.customrequestheaders.Remote-User=alfred
+      - traefik.http.middlewares.console-auth.headers.customrequestheaders.Remote-Name=Alfred Pennyworth
+      - traefik.http.middlewares.console-auth.headers.customrequestheaders.Remote-Email=alfred@example.com
       - metrics.port=8080
       - metrics.path=/api/v0/metrics
   akvorado-inlet: