diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e0f2daa..f32b4d72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ and this project adheres to
 ### Changed
 
 - ✨(summary) generalized stt api call #1420
+- ♻️(env) refactor env variables handling
 
 ## [1.21.0] - 2026-06-15
 
diff --git a/Makefile b/Makefile
index 3a4d8065..220b6d62 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,8 @@ create-env-files: \
 	env.d/development/kc_postgresql \
 	env.d/development/summary \
 	env.d/development/kube-secret \
-	env.d/development/multi_user_transcriber
+	env.d/development/multi_user_transcriber \
+	env.d/development/metadata_collector
 .PHONY: create-env-files
 
 bootstrap: ## Prepare Docker images for the project
@@ -292,6 +293,9 @@ env.d/development/kube-secret:
 env.d/development/multi_user_transcriber:
 	cp -n env.d/development/multi_user_transcriber.dist env.d/development/multi_user_transcriber
 
+env.d/development/metadata_collector:
+	cp -n env.d/development/metadata_collector.dist env.d/development/metadata_collector
+
 # -- Internationalization
 
 env.d/development/crowdin:
diff --git a/compose.yml b/compose.yml
index 750b8d40..68d62ed6 100644
--- a/compose.yml
+++ b/compose.yml
@@ -93,7 +93,7 @@ services:
     networks:
       - resource-server
       - default
-  
+
   celery-dev:
     user: ${DOCKER_USER:-1000}
     image: meet:backend-development
@@ -237,29 +237,22 @@ services:
       - livekit-egress
 
   livekit-egress:
-      image: livekit/egress:v1.11.0
-      environment:
-        EGRESS_CONFIG_FILE: ./livekit-egress.yaml
-      volumes:
-        - ./docker/livekit/config/livekit-egress.yaml:/livekit-egress.yaml
-        - ./docker/livekit/out:/out
-      depends_on:
-        - redis
+    image: livekit/egress:v1.11.0
+    environment:
+      EGRESS_CONFIG_FILE: ./livekit-egress.yaml
+    volumes:
+      - ./docker/livekit/config/livekit-egress.yaml:/livekit-egress.yaml
+      - ./docker/livekit/out:/out
+    depends_on:
+      - redis
 
   metadata-collector-dev:
     build:
       context: ./src/agents
       target: development
     command: ["python", "metadata_collector.py", "dev"]
-    environment:
-      - LIVEKIT_URL=ws://livekit:7880
-      - LIVEKIT_API_KEY=devkey
-      - LIVEKIT_API_SECRET=secret
-      - AWS_S3_ENDPOINT_URL=minio:9000
-      - AWS_S3_ACCESS_KEY_ID=meet
-      - AWS_S3_SECRET_ACCESS_KEY=password
-      - AWS_STORAGE_BUCKET_NAME=meet-media-storage
-      - AWS_S3_SECURE_ACCESS=False
+    env_file:
+      - env.d/development/metadata_collector
     volumes:
       - ./src/agents:/app
       - /app/.venv
diff --git a/env.d/development/common.dist b/env.d/development/common.dist
index 862f226b..a045e99a 100644
--- a/env.d/development/common.dist
+++ b/env.d/development/common.dist
@@ -57,6 +57,7 @@ OIDC_RS_CLIENT_SECRET=ThisIsAnExampleKeyForDevPurposeOnly
 LIVEKIT_API_SECRET=secret
 LIVEKIT_API_KEY=devkey
 LIVEKIT_API_URL=http://127.0.0.1.nip.io:7880
+LIVEKIT_INTERNAL_URL=http://livekit:7880
 LIVEKIT_VERIFY_SSL=False
 ALLOW_UNREGISTERED_ROOMS=False
 
@@ -86,6 +87,9 @@ ROOM_TELEPHONY_ENABLED=True
 # Metadata
 METADATA_COLLECTOR_ENABLED=True
 
+# Subtitle
+ROOM_SUBTITLE_ENABLED=False
+
 FRONTEND_USE_FRENCH_GOV_FOOTER=False
 FRONTEND_USE_PROCONNECT_BUTTON=False
 
@@ -94,3 +98,4 @@ EXTERNAL_API_ENABLED=True
 APPLICATION_JWT_AUDIENCE=http://localhost:8071/external-api/v1.0/
 APPLICATION_JWT_SECRET_KEY=devKey
 APPLICATION_BASE_URL=http://localhost:3000
+
diff --git a/env.d/development/multi_user_transcriber.dist b/env.d/development/multi_user_transcriber.dist
index 4950ebb3..cf01ebb2 100644
--- a/env.d/development/multi_user_transcriber.dist
+++ b/env.d/development/multi_user_transcriber.dist
@@ -2,8 +2,10 @@ LIVEKIT_URL=ws://livekit:7880
 LIVEKIT_API_KEY=devkey
 LIVEKIT_API_SECRET=secret
 
-STT_PROVIDER=kyutai
+STT_PROVIDER=kyutai # kyutai, deepgram
 ENABLE_SILERO_VAD=False
 
+DEEPGRAM_API_KEY=
+
 KYUTAI_STT_BASE_URL=
 KYUTAI_API_KEY=
diff --git a/env.d/development/summary.dist b/env.d/development/summary.dist
index ab83a629..5122504a 100644
--- a/env.d/development/summary.dist
+++ b/env.d/development/summary.dist
@@ -1,7 +1,7 @@
 APP_NAME="meet-app-summary-dev"
 APP_API_TOKEN="password"
 
-AWS_STORAGE_BUCKET_NAME="http://meet-media-storage"
+AWS_STORAGE_BUCKET_NAME="meet-media-storage"
 AWS_S3_ENDPOINT_URL="minio:9000"
 AWS_S3_SECURE_ACCESS=false
 
@@ -20,6 +20,11 @@ LLM_MODEL="albert-large"
 WEBHOOK_API_TOKEN="secret"
 WEBHOOK_URL="https://configure-your-url.com"
 
+IS_RESOLVE_SPEAKER_IDENTITIES_ENABLED=true
+RESOLVE_SPEAKER_IDENTITIES_DEFAULT_OVERLAP=0.5
+RESOLVE_SPEAKER_ENABLE_SPLIT_ON_WORDS=true
+RESOLVE_SPEAKER_MAX_WORD_DURATION=1
+
 POSTHOG_API_KEY="your-posthog-key"
 POSTHOG_ENABLED="False"
 
diff --git a/src/helm/env.d/common.yaml.gotmpl b/src/helm/env.d/common.yaml.gotmpl
index 1e83a36b..ae0cf195 100644
--- a/src/helm/env.d/common.yaml.gotmpl
+++ b/src/helm/env.d/common.yaml.gotmpl
@@ -53,6 +53,12 @@ _summaryEnvVars: &summaryEnvVars
   CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1
   CELERY_RESULT_BACKEND: redis://default:pass@redis-master:6379/1
   TASK_TRACKER_REDIS_URL: redis://default:pass@redis-master:6379/1
+  IS_RESOLVE_SPEAKER_IDENTITIES_ENABLED: true
+  RESOLVE_SPEAKER_IDENTITIES_DEFAULT_OVERLAP: 0.5
+  RESOLVE_SPEAKER_ENABLE_SPLIT_ON_WORDS: true
+  RESOLVE_SPEAKER_MAX_WORD_DURATION: 1
+  POSTHOG_API_KEY: your-posthog-key
+  POSTHOG_ENABLED: False
 
 _summaryImage: &summaryImage
   repository: localhost:5001/meet-summary
diff --git a/src/helm/env.d/dev-keycloak/values.meet.yaml.gotmpl b/src/helm/env.d/dev-keycloak/values.meet.yaml.gotmpl
index 0d27da0e..99c9aa15 100644
--- a/src/helm/env.d/dev-keycloak/values.meet.yaml.gotmpl
+++ b/src/helm/env.d/dev-keycloak/values.meet.yaml.gotmpl
@@ -28,6 +28,7 @@ agentSubtitles:
     {{- end }}
     {{- end }}
     ENABLE_SILERO_VAD: "false"
+    STT_PROVIDER: kyutai
 
   image:
     repository: localhost:5001/meet-agents