diff --git a/docker-compose.yml b/docker-compose.yml
index 0dc5b0e..623f597 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -273,7 +273,7 @@ services:
       COMMENTO_SMTP_FROM_ADDRESS: $COMMENTO_SMTP_FROM_ADDRESS
       COMMENTO_FORBID_NEW_OWNERS: $COMMENTO_FORBID_NEW_OWNERS
       COMMENTO_PORT: 8080
-      COMMENTO_POSTGRES: postgres://commento:your_password_here@commento-postgres:5432/commento?sslmode=disable
+      COMMENTO_POSTGRES: postgres://${COMMENTO_POSTGRES_USER}:${COMMENTO_POSTGRES_PASSWORD}@commento-postgres:5432/${COMMENTO_POSTGRES_DB}?sslmode=disable
     networks:
       - appnet
   commento-postgres:
@@ -285,9 +285,9 @@ services:
         condition: any
     image: postgres:11-alpine
     environment:
-      POSTGRES_DB: commento
-      POSTGRES_USER: commento
-      POSTGRES_PASSWORD: your_password_here
+      POSTGRES_DB: ${COMMENTO_POSTGRES_DB}
+      POSTGRES_USER: ${COMMENTO_POSTGRES_USER}
+      POSTGRES_PASSWORD: ${COMMENTO_POSTGRES_PASSWORD}
     networks:
       - appnet
     volumes: