diff --git a/i-form-data-repository/docker-services.yml b/i-form-data-repository/docker-services.yml
index 17213cd..b7b7834 100644
--- a/i-form-data-repository/docker-services.yml
+++ b/i-form-data-repository/docker-services.yml
@@ -65,9 +65,9 @@ services:
       network: host
     restart: "unless-stopped"
     environment:
-      - "POSTGRES_USER=${POSTGRES_USER:-i-form-data-repository}"
-      - "POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-i-form-data-repository}"
-      - "POSTGRES_DB=${POSTGRES_DB:-i-form-data-repository}"
+      - "POSTGRES_USER=${INVENIO_DATABASE_USER:-i-form-data-repository}"
+      - "POSTGRES_PASSWORD=${INVENIO_DATABASE_PASSWORD:-i-form-data-repository}"
+      - "POSTGRES_DB=${INVENIO_DATABASE_NAME:-i-form-data-repository}"
       - "WALG_S3_PREFIX=s3://${INVENIO_S3_BUCKET_NAME}/walg"
       - "AWS_ACCESS_KEY_ID=${INVENIO_S3_ACCESS_KEY_ID}"
       - "AWS_SECRET_ACCESS_KEY=${INVENIO_S3_SECRET_ACCESS_KEY}"