diff --git a/postgres/docker-compose-postgres.yml b/postgres/docker-compose-postgres.yml
index 6a9155d..cbbeffa 100644
--- a/postgres/docker-compose-postgres.yml
+++ b/postgres/docker-compose-postgres.yml
@@ -34,10 +34,11 @@ services:
     entrypoint: >
       bash -c "
       echo 'Waiting for PostgreSQL to start...';
-      until pg_isready -h postgres -U admin; do sleep 1; done;
-      echo 'Creating database and restoring backup...';
-      psql -h postgres -U admin -c 'CREATE DATABASE mydb;';
-      pg_restore -h postgres -U admin -d mydb /backups/backup.dump;
+      until pg_isready -h ${POSTGRESQL_HOSTNAME_NAME} -U ${POSTGRES_USER}; do sleep 1; done;
+      echo 'Creating database ${POSTGRES_DB} if it does not exist...';
+      psql -h ${POSTGRESQL_HOSTNAME_NAME} -U ${POSTGRES_USER} -c 'CREATE DATABASE ${POSTGRES_DB};' || true;
+      echo 'Restoring backup from /backups/backup.dump into ${POSTGRES_DB}...';
+      pg_restore -h ${POSTGRESQL_HOSTNAME_NAME} -U ${POSTGRES_USER} -d ${POSTGRES_DB} ${POSTGRES_DB_DUMP};
       echo 'Backup restored successfully.';
       "
     restart: on-failure