diff --git a/traefik/compose.yaml b/traefik/compose.yaml
index 3f76f53..18b4f8e 100644
--- a/traefik/compose.yaml
+++ b/traefik/compose.yaml
@@ -1,6 +1,3 @@
-volumes:
-  acme:
-
 services:
   traefik:
     image: traefik:3
@@ -14,11 +11,6 @@ services:
       - acme:/acme/
       #- ./volume/usersFile:/usersFile # Basic Auth
     network_mode: host
-    labels:
-      - traefik.enable=true
-      # Wildcard http -> https redirection for all routers
-      - traefik.http.routers.http-catchall.rule=HostRegexp(`.`)
-      - traefik.http.routers.http-catchall.entrypoints=http
-      - traefik.http.routers.http-catchall.middlewares=redirect-to-https@docker
-      - traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https
-      - traefik.http.services.http-catchall.loadbalancer.server.port=80
+
+volumes:
+  acme:
diff --git a/whoami/compose.yaml b/whoami/compose.yaml
index 2589dc2..a3adf6f 100644
--- a/whoami/compose.yaml
+++ b/whoami/compose.yaml
@@ -3,13 +3,13 @@ services:
     # A container that exposes an API to show its IP address
     image: containous/whoami
     labels:
-      - traefik.enable=true
+      traefik.enable: true
       # Enable HTTPS
-      - traefik.http.routers.whoami.rule=Host(${TRAEFIK_HOST})
-      - traefik.http.routers.whoami.tls=true
-      - traefik.http.routers.whoami.tls.certresolver=letsencrypt
-      - traefik.http.routers.whoami.middlewares=secured@file # ip allowlist
+      traefik.http.routers.whoami.rule: Host(${TRAEFIK_HOST})
+      traefik.http.routers.whoami.tls: true
+      traefik.http.routers.whoami.tls.certresolver: letsencrypt
+      traefik.http.routers.whoami.middlewares: secured@file # ip allowlist
       # # Basic Auth - Users and Passwords must be added to volume/traefik/usersFile
-      # - traefik.http.routers.whoami.middlewares=basic-auth@file
+      # traefik.http.routers.whoami.middlewares: basic-auth@file
       # # Specify web port from container (if container is not listen on default port 80)
-      # - traefik.http.services.whoami.loadbalancer.server.port=8080
+      # traefik.http.services.whoami.loadbalancer.server.port: 8080