diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 0a46c73..de5ad5e 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -3,10 +3,12 @@ services:
     image: postgres:16
     container_name: condado-newsletter-postgres
     restart: unless-stopped
+    env_file:
+      - .env
     environment:
       POSTGRES_DB: ${APP_DB_NAME:-condado}
-      POSTGRES_USER: ${POSTGRES_USER:-${SPRING_DATASOURCE_USERNAME:-condado}}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-${SPRING_DATASOURCE_PASSWORD:-condado}}
+      POSTGRES_USER: ${POSTGRES_USER:-condado}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-condado}
     volumes:
       - postgres-data:/var/lib/postgresql/data
     networks:
@@ -22,6 +24,8 @@ services:
     image: sancho41/condado-newsletter:latest
     container_name: condado-newsletter
     restart: unless-stopped
+    env_file:
+      - .env
     depends_on:
       condado-newsletter-postgres:
         condition: service_healthy
@@ -32,9 +36,8 @@ services:
       SPRING_PROFILES_ACTIVE: prod
       SPRING_JPA_HIBERNATE_DDL_AUTO: ${SPRING_JPA_HIBERNATE_DDL_AUTO:-update}
       SPRING_DATASOURCE_URL: jdbc:postgresql://condado-newsletter-postgres:5432/${APP_DB_NAME:-condado}
-      SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME:-${POSTGRES_USER:-condado}}
-      SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD:-${POSTGRES_PASSWORD:-condado}}
-      APP_PASSWORD: ${APP_PASSWORD}
+      SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME:-condado}
+      SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD:-condado}
       JWT_SECRET: ${JWT_SECRET}
       JWT_EXPIRATION_MS: ${JWT_EXPIRATION_MS:-86400000}
       MAIL_HOST: ${MAIL_HOST}