diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index caf665a..d92adc4 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -20,8 +20,7 @@ services:
       - db-data-fiscad:/var/lib/postgresql/data
 
     healthcheck:
-      #test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER_FISCAD}"]
-      test: ["CMD-SHELL", "pg_isready -U fiscad_user -d fiscad_db"]
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER_FISCAD} -d ${POSTGRES_DB_FISCAD} "]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -37,8 +36,8 @@ services:
       - db
 
     environment:
-      SPRING_DATASOURCE_URL: jdbc:postgresql://db:5432/fiscad_db   #${POSTGRES_DB_FISCAD}
-      SPRING_DATASOURCE_USERNAME: fiscad_user #${POSTGRES_USER_FISCAD}
+      SPRING_DATASOURCE_URL: jdbc:postgresql://db:5432/${POSTGRES_DB_FISCAD}
+      SPRING_DATASOURCE_USERNAME: ${POSTGRES_USER_FISCAD}
 
       SERVER_PORT: 8282
       IO_GMSS_FISCAD_PROFILE: dgi