diff --git a/infra/docker-compose.yml b/infra/docker-compose.yml
index 0b1b953..578e92f 100644
--- a/infra/docker-compose.yml
+++ b/infra/docker-compose.yml
@@ -21,11 +21,16 @@ services:
     build:
       context: ..
       dockerfile: apps/api-daemon/Dockerfile
-    env_file: ../.env
     environment:
       REDIS_URL: redis://sc_redis:6379
       DATABASE_URL: postgresql://streamclipper:streamclipper@sc_postgres:5432/streamclipper
       SHARED_MEDIA_ROOT: /shared-media
+      POLL_INTERVAL_MS: ${POLL_INTERVAL_MS:-60000}
+      SEGMENT_TIME_SEC: ${SEGMENT_TIME_SEC:-900}
+      API_DAEMON_PORT: ${API_DAEMON_PORT:-4001}
+      FORCE_LIVE_URL: ${FORCE_LIVE_URL:-}
+      TELEGRAM_BOT_TOKEN: ${TELEGRAM_BOT_TOKEN:-}
+      TELEGRAM_CHAT_ID: ${TELEGRAM_CHAT_ID:-}
     volumes:
       - shared-media:/shared-media
     ports:
@@ -38,11 +43,14 @@ services:
     build:
       context: ..
       dockerfile: apps/worker/Dockerfile
-    env_file: ../.env
     environment:
       REDIS_URL: redis://sc_redis:6379
       DATABASE_URL: postgresql://streamclipper:streamclipper@sc_postgres:5432/streamclipper
       SHARED_MEDIA_ROOT: /shared-media
+      SEGMENT_TIME_SEC: ${SEGMENT_TIME_SEC:-900}
+      OPENAI_API_KEY: ${OPENAI_API_KEY:-}
+      TELEGRAM_BOT_TOKEN: ${TELEGRAM_BOT_TOKEN:-}
+      TELEGRAM_CHAT_ID: ${TELEGRAM_CHAT_ID:-}
     volumes:
       - shared-media:/shared-media
     depends_on:
@@ -53,7 +61,6 @@ services:
     build:
       context: ..
       dockerfile: apps/frontend/Dockerfile
-    env_file: ../.env
     environment:
       DATABASE_URL: postgresql://streamclipper:streamclipper@sc_postgres:5432/streamclipper
     ports: