diff --git a/.docker-compose.livekit.yml b/.docker-compose.livekit.yml
index 54ec957..5053851 100644
--- a/.docker-compose.livekit.yml
+++ b/.docker-compose.livekit.yml
@@ -138,13 +138,6 @@ services:
     command: --config /etc/livekit.yaml --node-ip <hostIp>
     restart: unless-stopped
     network_mode: host
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.livekit-ja.tls=true"
-      - "traefik.http.routers.livekit-ja.rule=Host(`<livekitUrl>`)"
-      - "traefik.http.routers.livekit-ja.entrypoints=web"
-      - "traefik.http.routers.livekit-ja.tls.certresolver=letsencrypt"
-      - "traefik.http.services.livekit-ja.loadbalancer.server.port=7880"
     volumes:
       - ./livekit/livekit.yaml:/etc/livekit.yaml
   redis-ja:
diff --git a/.templates/traefik-livekit.yaml b/.templates/traefik-livekit.yaml
new file mode 100644
index 0000000..f46f9fd
--- /dev/null
+++ b/.templates/traefik-livekit.yaml
@@ -0,0 +1,15 @@
+http:
+  routers:
+    livekit-ja:
+      rule: "Host(`<livekitUrl>`)"
+      entryPoints:
+        - web
+      service: livekit-ja
+      tls:
+        certResolver: letsencrypt
+
+  services:
+    livekit-ja:
+      loadBalancer:
+        servers:
+          - url: "http://host.docker.internal:7880"
diff --git a/setup.sh b/setup.sh
index 610a536..666b15d 100644
--- a/setup.sh
+++ b/setup.sh
@@ -124,8 +124,8 @@ APP_SCHEME='$HTTP_METHOD'
 MAILER_DSN='null://null'
 DATABASE_URL='mysql://jitsiadmin:$JITSI_ADMIN_PW@db-ja:3306/jitsiadmin'
 laF_baseUrl='$HTTP_METHOD://$PUBLIC_URL'
+laF_startpage='0'
 VICH_BASE='$HTTP_METHOD://$PUBLIC_URL'
-GIT_VERSION=1.0.12
 PUBLIC_URL='$PUBLIC_URL'
 OAUTH_KEYCLOAK_CLIENT_SECRET=$NEW_UUID
 OAUTH_KEYCLOAK_SERVER='$HTTP_METHOD://$PUBLIC_URL/keycloak'
@@ -136,8 +136,8 @@ DEFAULT_LANGUAGE=$default_language
 MERCURE_URL='http://websocket-ja:3000/.well-known/mercure'
 MERCURE_PUBLIC_URL='$HTTP_METHOD://$PUBLIC_URL'
 WEBSOCKET_SECRET=$MERCURE_JWT_SECRET
-KEYCLOAK_BOOTSTRAP_ADMIN_username=admin
-KEYCLOAK_BOOTSTRAP_ADMIN_PASSWORD=$KEYCLOAK_ADMIN_PW
+KC_BOOTSTRAP_ADMIN_USERNAME=admin
+KC_BOOTSTRAP_ADMIN_PASSWORD=$KEYCLOAK_ADMIN_PW
 KC_DB=mariadb
 KC_DB_USERNAME=keycloak
 KC_DB_PASSWORD=$KEYCLOAK_PW
@@ -161,13 +161,16 @@ sed -i "s|<version>|$VERSION|g" docker-compose.yml
 
 
 echo ------------------------------------------------------------
-echo --------- 3. Build Docker Compose File ---------------------
+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
+
 
 echo ------------------------------------------------------------
 echo --------- 4. Migrate and Setup Docker Volume User ----------
diff --git a/traefik/.gitkeep b/traefik/.gitkeep
new file mode 100644
index 0000000..e69de29