diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml
index 967bfaf..acdb18c 100644
--- a/traefik/docker-compose.yml
+++ b/traefik/docker-compose.yml
@@ -11,7 +11,7 @@ networks:
 services:
   traefik:
     container_name: ${TRAEFIK_CONTAINER_NAME:-traefik}
-    image: ${TRAEFIK_IMAGE:-traefik:v2.5.3}
+    image: ${TRAEFIK_IMAGE:-traefik:v2.5.4}
     restart: always
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
@@ -38,14 +38,12 @@ services:
       - --providers.docker.exposedbydefault=false
       - --providers.docker.network=${TRAEFIK_NETWORK_NAME:-traefik}
 
-      - --entryPoints.traefik.address=:8080
+      - --entryPoints.${TRAEFIK_ROUTER_NAME:-traefik}.address=:8080
 
-      - --entrypoints.web.address=:80
-      - --entryPoints.web.forwardedHeaders.insecure
+      - --entrypoints.${TRAEFIK_ENTRYPOINTS:-web}.address=:80
+      - --entryPoints.${TRAEFIK_ENTRYPOINTS:-web}.forwardedHeaders.insecure
     labels:
-      traefik.enable: 'true'
-
-      traefik.http.routers.traefik.rule: 'Host(`${TRAEFIK_DOMAIN:?err}`)'
-      traefik.http.routers.traefik.entrypoints: 'web'
-
-      traefik.http.services.traefik.loadbalancer.server.port: '8080'
+      - traefik.enable=true
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-traefik}.rule=Host(`${TRAEFIK_DOMAIN:?err}`)
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-traefik}.entrypoints=${TRAEFIK_ENTRYPOINTS:-web}
+      - traefik.http.services.${TRAEFIK_ROUTER_NAME:-traefik}.loadbalancer.server.port=8080