diff --git a/email_api/docker-compose.yml b/email_api/docker-compose.yml
index b55b88d..0039b1a 100644
--- a/email_api/docker-compose.yml
+++ b/email_api/docker-compose.yml
@@ -1,10 +1,11 @@
+version: '3.8'
+
 services:
   email-api:
     container_name: email-api
     image: node:22-slim
     restart: unless-stopped
-    ports:
-      - "5000:5000"  # Map REST API port
+    network_mode: host
     volumes:
       - ./email_api:/app
       - /var/mail:/var/mail  # Maildir access for health check
@@ -16,7 +17,7 @@ services:
       - AWS_REGION=${AWS_REGION}
       - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
       - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
-      - SMTP_HOST=${SMTP_HOST:-smtp}  # Reference SMTP service or external host
+      - SMTP_HOST=${SMTP_HOST:-localhost}
       - SMTP_PORT=${SMTP_PORT:-25}
       - MAILCOW_API_KEY=${MAILCOW_API_KEY}
       - MAILCOW_API=${MAILCOW_API}
@@ -24,20 +25,17 @@ services:
       - PGUSER=${PGUSER:-email_user}
       - PGPASSWORD=${PGPASSWORD:-email_password}
       - PGDATABASE=${PGDATABASE:-email_db}
-      - PGPORT=${PGPORT:-5432}
+      - PGPORT=${PGPORT:-5433}
     command: >
       bash -c "npm install && node app.js"
     depends_on:
       - postgres
-    networks:
-      - email-network
 
   postgres:
     container_name: email-api-postgres
     image: postgres:16
     restart: unless-stopped
-    ports:
-      - "5433:5432"  # Map container port 5432 to host port 5433
+    network_mode: host
     environment:
       - POSTGRES_USER=${PGUSER:-email_user}
       - POSTGRES_PASSWORD=${PGPASSWORD:-email_password}
@@ -45,12 +43,8 @@ services:
     volumes:
       - email_postgres_data:/var/lib/postgresql/data
       - ./init.sql:/docker-entrypoint-initdb.d/init.sql
-    networks:
-      - email-network
-
-networks:
-  email-network:
-    driver: bridge
+    command: >
+      postgres -c port=${PGPORT:-5433}      
 
 volumes:
   email_postgres_data:
\ No newline at end of file