diff --git a/docker-compose.yml b/docker-compose.yml
index 67c48ee..bb16d9a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,13 +8,13 @@ x-shared: &shared
   image: docker.n8n.io/n8nio/n8n
   environment:
     - DB_TYPE=postgresdb
-    - DB_POSTGRESDB_HOST=n8n_postgres
+    - DB_POSTGRESDB_HOST=daffnie-n8n_postgres
     - DB_POSTGRESDB_PORT=5432
     - DB_POSTGRESDB_DATABASE=${POSTGRES_DB}
     - DB_POSTGRESDB_USER=${POSTGRES_NON_ROOT_USER}
     - DB_POSTGRESDB_PASSWORD=${POSTGRES_NON_ROOT_PASSWORD}
     - EXECUTIONS_MODE=queue
-    - QUEUE_BULL_REDIS_HOST=n8n_redis
+    - QUEUE_BULL_REDIS_HOST=daffnie-n8n_redis
     - QUEUE_HEALTH_CHECK_ACTIVE=true
     - N8N_ENCRYPTION_KEY=${ENCRYPTION_KEY}
     - N8N_HOST=${N8N_HOST}
@@ -23,20 +23,29 @@ x-shared: &shared
     - N8N_RUNNERS_ENABLED=true
     - N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=true
     - OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS=true
+    - N8N_EMAIL_MODE=smtp
+    - N8N_SMTP_HOST=${N8N_SMTP_HOST}
+    - N8N_SMTP_PORT=${N8N_SMTP_PORT}
+    - N8N_SMTP_USER=${N8N_SMTP_USER}
+    - N8N_SMTP_PASS=${N8N_SMTP_PASS}
+    - N8N_SMTP_SENDER=${N8N_SMTP_SENDER}
+    - N8N_USER_MANAGEMENT_DISABLED=false
+    - N8N_EXPRESS_TRUST_PROXY=true
+    - N8N_EXPRESS_TRUST_PROXY=${N8N_EXPRESS_TRUST_PROXY}
   links:
-    - n8n_postgres
-    - n8n_redis
+    - daffnie-n8n_postgres
+    - daffnie-n8n_redis
   volumes:
     - n8n_storage:/home/node/.n8n
   depends_on:
-    n8n_redis:
+    daffnie-n8n_redis:
       condition: service_healthy
-    n8n_postgres:
+    daffnie-n8n_postgres:
       condition: service_healthy
 
 services:
-  n8n_postgres:
-    container_name: n8n_postgres
+  daffnie-n8n_postgres:
+    container_name: daffnie-n8n_postgres
     image: postgres:16
     restart: unless-stopped
     environment:
@@ -62,8 +71,8 @@ services:
           cpus: "${POSTGRES_RESERVE_CPUS}"
           memory: "${POSTGRES_RESERVE_MEMORY}"
 
-  n8n_redis:
-    container_name: n8n_redis
+  daffnie-n8n_redis:
+    container_name: daffnie-n8n_redis
     image: redis:6-alpine
     restart: unless-stopped
     volumes:
@@ -82,10 +91,10 @@ services:
           cpus: "${REDIS_RESERVE_CPUS}"
           memory: "${REDIS_RESERVE_MEMORY}"
 
-  n8n_main:
+  daffnie-n8n_main:
     <<: *shared
     restart: unless-stopped
-    container_name: n8n_main
+    container_name: daffnie-n8n_main
     ports:
       - ${N8N_PORT}:5678
     deploy:
@@ -97,13 +106,13 @@ services:
           cpus: "${N8N_RESERVE_CPUS}"
           memory: "${N8N_RESERVE_MEMORY}"
 
-  n8n_worker:
+  daffnie-n8n_worker:
     <<: *shared
     restart: unless-stopped
-    container_name: n8n_worker
+    container_name: daffnie-n8n_worker
     command: worker
     depends_on:
-      - n8n_main
+      - daffnie-n8n_main
     deploy:
       resources:
         limits:
@@ -112,4 +121,4 @@ services:
         reservations:
           cpus: "${N8N_WORKER_RESERVE_CPUS}"
           memory: "${N8N_WORKER_RESERVE_MEMORY}"
-    
\ No newline at end of file
+