diff --git a/.docker-compose.livekit.yml b/.docker-compose.livekit.yml
index 5053851..c79e1ab 100644
--- a/.docker-compose.livekit.yml
+++ b/.docker-compose.livekit.yml
@@ -7,6 +7,8 @@ services:
       - "--api.insecure=true"
       - "--providers.docker=true"
       - "--providers.docker.exposedbydefault=false"
+      - "--providers.file.directory=/etc/traefik/dynamic"
+      - "--providers.file.watch=true"
       - "--entrypoints.unsecure.address=:80"
       # Global HTTPS
       - "--entrypoints.web.address=:443"
@@ -27,7 +29,7 @@ services:
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
       -  ./data/letsencrypt:/letsencrypt
-      - ./tools/traefik/config.yml:/etc/traefik/dynamic_conf/conf.yml:ro
+      - ./traefik/:/etc/traefik/dynamic:ro
 
   websocket-ja:
     hostname: websocket-ja
diff --git a/setup.sh b/setup.sh
index 666b15d..d85829a 100644
--- a/setup.sh
+++ b/setup.sh
@@ -68,11 +68,13 @@ fi
   sed -i '/PUBLIC_URL/d' $FILE
   echo "PUBLIC_URL=$PUBLIC_URL" >> $FILE
 
-  LIVEKIT_URL=${LIVEKIT_URL:=livekit-dev.domain.de}
-  read -p "Enter the url you want run your livekit server on (no http/https) [$LIVEKIT_URL]: " input
-  LIVEKIT_URL=${input:=$LIVEKIT_URL}
-  sed -i '/LIVEKIT_URL/d' $FILE
-  echo "LIVEKIT_URL=$LIVEKIT_URL" >> $FILE
+  if [ "$ENVIRONMENT" = "livekit" ]; then
+    LIVEKIT_URL=${LIVEKIT_URL:=livekit-dev.domain.de}
+    read -p "Enter the url you want run your livekit server on (no http/https) [$LIVEKIT_URL]: " input
+    LIVEKIT_URL=${input:=$LIVEKIT_URL}
+    sed -i '/LIVEKIT_URL/d' $FILE
+    echo "LIVEKIT_URL=$LIVEKIT_URL" >> $FILE
+  fi
 
   default_language=${default_language:=en}
   read -p "Which language you want to set as default allowed values: [de, en, fr, es, vi, zh, ru, ja, pt]: [$default_language] " input
@@ -160,17 +162,18 @@ sed -i "s|<hostIp>|$HOST_IP|g" docker-compose.yml
 sed -i "s|<version>|$VERSION|g" docker-compose.yml
 
 
-echo ------------------------------------------------------------
-echo --------- 3. Setup Livekit ---------------------------------
-echo ------------------------------------------------------------
-echo ""
-cp .templates/livekit.yaml livekit/livekit.yaml
-sed -i "s|<secret>|$LIVEKIT_KEY|g" livekit/livekit.yaml
-sed -i "s|<keycloak-pw>|$KEYCLOAK_PW|g" livekit/livekit.yaml
-
-cp .templates/traefik-livekit.yaml traefik/config.yaml
-sed -i "s|<livekitUrl>|$LIVEKIT_URL|g" traefik/config.yaml
+if [ "$ENVIRONMENT" = "livekit" ]; then
+  echo ------------------------------------------------------------
+  echo --------- 3. Setup Livekit ---------------------------------
+  echo ------------------------------------------------------------
+  echo ""
+  cp .templates/livekit.yaml livekit/livekit.yaml
+  sed -i "s|<secret>|$LIVEKIT_KEY|g" livekit/livekit.yaml
+  sed -i "s|<keycloak-pw>|$KEYCLOAK_PW|g" livekit/livekit.yaml
 
+  cp .templates/traefik-livekit.yaml traefik/config.yaml
+  sed -i "s|<livekitUrl>|$LIVEKIT_URL|g" traefik/config.yaml
+fi
 
 echo ------------------------------------------------------------
 echo --------- 4. Migrate and Setup Docker Volume User ----------