diff --git a/rootfs/etc/cont-init.d/00-roundcube b/rootfs/etc/cont-init.d/00-roundcube
index 1034522..6186d37 100644
--- a/rootfs/etc/cont-init.d/00-roundcube
+++ b/rootfs/etc/cont-init.d/00-roundcube
@@ -1,8 +1,8 @@
 #!/usr/bin/with-contenv sh
 
-PGPASSWORD=$DBPASSWORD psql -h $DBHOST -U $DBUSER -d $DBNAME -c "SELECT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'session')" | grep f
+PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -U $DB_USER -d $DB_NAME -c "SELECT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'session')" | grep f
 
 if [ $? -ne 1 ]; then
-   PGPASSWORD=$DBPASSWORD psql -h $DBHOST -U $DBUSER -d $DBNAME -f /var/lib/roundcube/SQL/postgres.initial.sql
+   PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -U $DB_USER -d $DB_NAME -f /var/lib/roundcube/SQL/postgres.initial.sql
 fi