diff --git a/01-infra/docker-compose.yml b/01-infra/docker-compose.yml
index 126e062..5d81e00 100644
--- a/01-infra/docker-compose.yml
+++ b/01-infra/docker-compose.yml
@@ -11,6 +11,8 @@ services:
       - ./letsencrypt:/etc/letsencrypt
     environment:
       - TZ=${TZ:-Asia/Bangkok}
+    env_file:
+      - ../.env.global
     networks:
       - shared_data_network
     restart: unless-stopped
@@ -19,11 +21,13 @@ services:
     image: quay.io/keycloak/keycloak:23.0
     container_name: keycloak
     command: start-dev
+    env_file:
+      - ../.env.global
     environment:
       KC_BOOTSTRAP_ADMIN_USERNAME: ${KEYCLOAK_ADMIN}
       KC_BOOTSTRAP_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD}
       KC_DB: postgres
-      KC_DB_URL: jdbc:postgresql://postgres:5432/${DB_NAME}
+      KC_DB_URL: jdbc:postgresql://postgres:5432/${KEYCLOAK_DB_NAME}
       KC_DB_USERNAME: ${DB_USER}
       KC_DB_PASSWORD: ${DB_PASSWORD}
       KC_HOSTNAME_STRICT: "false"
@@ -40,8 +44,10 @@ services:
   postgres:
     image: postgres:15-alpine
     container_name: postgres
+    env_file:
+      - ../.env.global
     environment:
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
       POSTGRES_USER: ${DB_USER}
       POSTGRES_DB: ${DB_NAME}
       TZ: ${TZ:-Asia/Bangkok}
diff --git a/03-apiservice/docker-compose.yml b/03-apiservice/docker-compose.yml
index 3c8288b..5f380cd 100644
--- a/03-apiservice/docker-compose.yml
+++ b/03-apiservice/docker-compose.yml
@@ -2,6 +2,8 @@ services:
   apiservice:
     build: .
     container_name: apiservice
+    env_file:
+      - ../.env.global
     environment:
       - TZ=${TZ:-Asia/Bangkok}
       - DB_HOST=${DB_HOST}
diff --git a/04-ingestion/docker-compose.yml b/04-ingestion/docker-compose.yml
index 648c1d8..575232a 100644
--- a/04-ingestion/docker-compose.yml
+++ b/04-ingestion/docker-compose.yml
@@ -40,9 +40,11 @@ services:
       - shared_data_network
 ###0.63.8
   airbyte-temporal:
-    image: airbyte/temporal:1.8.5
+    image: airbyte/temporal:1.7.8
     container_name: airbyte-temporal
     restart: unless-stopped
+    env_file:
+      - ../.env.global
     environment:
       - DB=postgresql
       - DB_PORT=${DB_PORT}
@@ -55,11 +57,13 @@ services:
       - shared_data_network
 
   bootloader:
-    image: airbyte/bootloader:1.8.5
+    image: airbyte/bootloader:1.7.8
     container_name: airbyte-bootloader
     restart: "no"
+    env_file:
+      - ../.env.global
     environment:
-      - AIRBYTE_VERSION=1.8.5
+      - AIRBYTE_VERSION=1.7.8
       - DATABASE_URL=jdbc:postgresql://${DB_HOST}:${DB_PORT}/airbyte
       - DATABASE_USER=${DB_USER}
       - DATABASE_PASSWORD=${DB_PASSWORD}
@@ -68,15 +72,17 @@ services:
       - shared_data_network
 
   worker:
-    image: airbyte/worker:1.8.5
+    image: airbyte/worker:1.7.8
     container_name: airbyte-worker
     restart: unless-stopped
+    env_file:
+      - ../.env.global
     depends_on:
       - docker-proxy
       - airbyte-temporal
       - bootloader
     environment:
-      - AIRBYTE_VERSION=1.8.5
+      - AIRBYTE_VERSION=1.7.8
       - DATABASE_URL=jdbc:postgresql://${DB_HOST}:${DB_PORT}/airbyte
       - DATABASE_USER=${DB_USER}
       - DATABASE_PASSWORD=${DB_PASSWORD}
@@ -95,14 +101,16 @@ services:
       - shared_data_network
 
   server:
-    image: airbyte/server:1.8.5
+    image: airbyte/server:1.7.8
     container_name: airbyte-server
     restart: unless-stopped
     depends_on:
       - airbyte-temporal
       - bootloader
+    env_file:
+      - ../.env.global
     environment:
-      - AIRBYTE_VERSION=1.8.5
+      - AIRBYTE_VERSION=1.7.8
       - DATABASE_URL=jdbc:postgresql://${DB_HOST}:${DB_PORT}/airbyte
       - DATABASE_USER=${DB_USER}
       - DATABASE_PASSWORD=${DB_PASSWORD}
@@ -121,7 +129,7 @@ services:
       - shared_data_network
 
   webapp:
-    image: airbyte/webapp:1.8.5
+    image: airbyte/webapp:1.7.8
     container_name: airbyte-webapp
     restart: unless-stopped
     environment:
@@ -132,13 +140,15 @@ services:
       - server
 
   airbyte-cron:
-    image: airbyte/cron:1.8.5
+    image: airbyte/cron:1.7.8
     container_name: airbyte-cron
     restart: unless-stopped
     depends_on:
       - bootloader
+    env_file:
+      - ../.env.global
     environment:
-      - AIRBYTE_VERSION=1.8.5
+      - AIRBYTE_VERSION=1.7.8
       - DATABASE_URL=jdbc:postgresql://${DB_HOST}:${DB_PORT}/airbyte
       - DATABASE_USER=${DB_USER}
       - DATABASE_PASSWORD=${DB_PASSWORD}
@@ -151,7 +161,7 @@ services:
       - shared_data_network
 
   airbyte-api-server:
-    image: airbyte/airbyte-api-server:1.8.5
+    image: airbyte/airbyte-api-server:0.63.8
     container_name: airbyte-api-server
     restart: unless-stopped
     depends_on:
@@ -160,7 +170,7 @@ services:
       - shared_data_network
 
   airbyte-connector-builder-server:
-    image: airbyte/connector-builder-server:1.8.5
+    image: airbyte/connector-builder-server:1.7.8
     container_name: airbyte-connector-builder-server
     restart: unless-stopped
     depends_on:
@@ -169,9 +179,11 @@ services:
       - shared_data_network
 
   airbyte-proxy:
-    image: airbyte/proxy:1.8.5
+    image: airbyte/proxy:1.4.1
     container_name: airbyte-proxy
     restart: unless-stopped
+    env_file:
+      - ../.env.global
     ports:
       - "8030:8000"
       - "8001:8001"
diff --git a/06-analytics/docker-compose.yml b/06-analytics/docker-compose.yml
index 7774522..42780e5 100644
--- a/06-analytics/docker-compose.yml
+++ b/06-analytics/docker-compose.yml
@@ -2,10 +2,12 @@ services:
   superset:
     image: apache/superset:latest
     container_name: superset
+    env_file:
+      - ../.env.global
     environment:
       - SUPERSET_SECRET_KEY=${SUPERSET_SECRET_KEY}
       - DATABASE_DIALECT=postgresql
-      - DATABASE_HOST=postgres
+      - DATABASE_HOST=${DB_HOST}
       - DATABASE_PORT=5432
       - DATABASE_DB=superset
       - DATABASE_USER=${DB_USER}