diff --git a/docker-compose.yaml b/docker-compose.yaml
index e5e6489c..f7563fb9 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,20 +1,21 @@
 version: "3"
 services:
   reverse-proxy:
-    image: traefik:v2.0
+    image: traefik:v2.5
     command:
       - --api.insecure=true
       - --providers.docker
       - --entryPoints.web.address=:80
       - --entryPoints.websecure.address=:443
+      - "--providers.docker.exposedbydefault=false"
     ports:
       - "80:80"
       - "443:443"
       # The Web UI (enabled by --api.insecure=true)
       - "8080:8080"
-    depends_on:
-      - back
-      - front
+    #depends_on:
+    #  - back
+    #  - front
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     networks:
@@ -51,10 +52,12 @@ services:
       MAX_USERNAME_LENGTH: "$MAX_USERNAME_LENGTH"
       DISABLE_ANONYMOUS: "$DISABLE_ANONYMOUS"
       OPID_LOGIN_SCREEN_PROVIDER: "$OPID_LOGIN_SCREEN_PROVIDER"
+      LIVE_RELOAD: "$LIVE_RELOAD:-true"
     command: yarn run start
     volumes:
       - ./front:/usr/src/app
     labels:
+      - "traefik.enable=true"
       - "traefik.http.routers.front.rule=Host(`play.workadventure.localhost`)"
       - "traefik.http.routers.front.entryPoints=web"
       - "traefik.http.services.front.loadbalancer.server.port=8080"
@@ -87,6 +90,7 @@ services:
     volumes:
       - ./pusher:/usr/src/app
     labels:
+      - "traefik.enable=true"
       - "traefik.http.routers.pusher.rule=Host(`pusher.workadventure.localhost`)"
       - "traefik.http.routers.pusher.entryPoints=web"
       - "traefik.http.services.pusher.loadbalancer.server.port=8080"
@@ -111,6 +115,7 @@ services:
     volumes:
       - ./maps:/var/www/html
     labels:
+      - "traefik.enable=true"
       - "traefik.http.routers.maps.rule=Host(`maps.workadventure.localhost`)"
       - "traefik.http.routers.maps.entryPoints=web,traefik"
       - "traefik.http.services.maps.loadbalancer.server.port=80"
@@ -142,6 +147,7 @@ services:
     volumes:
       - ./back:/usr/src/app
     labels:
+      - "traefik.enable=true"
       - "traefik.http.routers.back.rule=Host(`api.workadventure.localhost`)"
       - "traefik.http.routers.back.entryPoints=web"
       - "traefik.http.services.back.loadbalancer.server.port=8080"
@@ -160,6 +166,7 @@ services:
     volumes:
       - ./uploader:/usr/src/app
     labels:
+      - "traefik.enable=true"
       - "traefik.http.routers.uploader.rule=Host(`uploader.workadventure.localhost`)"
       - "traefik.http.routers.uploader.entryPoints=web"
       - "traefik.http.services.uploader.loadbalancer.server.port=8080"
@@ -187,6 +194,7 @@ services:
   redisinsight:
     image: redislabs/redisinsight:latest
     labels:
+      - "traefik.enable=true"
       - "traefik.http.routers.redisinsight.rule=Host(`redis.workadventure.localhost`)"
       - "traefik.http.routers.redisinsight.entryPoints=web"
       - "traefik.http.services.redisinsight.loadbalancer.server.port=8001"
@@ -198,6 +206,7 @@ services:
   icon:
     image: matthiasluedtke/iconserver:v3.13.0
     labels:
+      - "traefik.enable=true"
       - "traefik.http.routers.icon.rule=Host(`icon.workadventure.localhost`)"
       - "traefik.http.routers.icon.entryPoints=web"
       - "traefik.http.services.icon.loadbalancer.server.port=8080"
diff --git a/front/webpack.config.ts b/front/webpack.config.ts
index 7a189911..77ad92bd 100644
--- a/front/webpack.config.ts
+++ b/front/webpack.config.ts
@@ -32,6 +32,7 @@ module.exports = {
             rewrites: [{ from: /^_\/.*$/, to: "/index.html" }],
             disableDotRule: true,
         },
+        liveReload: process.env.LIVE_RELOAD != "0" && process.env.LIVE_RELOAD != "false",
     },
     module: {
         rules: [