diff --git a/.env.development b/.env.development
index ff901e5..dc83c80 100644
--- a/.env.development
+++ b/.env.development
@@ -38,7 +38,7 @@ POSTGRES_PASSWORD=wacefems-pg-password-PPw09!keep
 # TimescaleDB
 TIMESCALEDB_HOST=fems-timescaledb
 TIMESCALEDB_PORT=5433
-TIMESCALEDB_DATABASE=fems_timeseries_da
+TIMESCALEDB_DB=fems_timeseries_da
 TIMESCALEDB_USER=wacefems-tsdb-user
 TIMESCALEDB_PASSWORD=wacefems-tsdb-password-PPw09!keep
 
diff --git a/docker-compose.db.yml b/docker-compose.db.yml
index 933f3bf..335d3f5 100644
--- a/docker-compose.db.yml
+++ b/docker-compose.db.yml
@@ -52,7 +52,7 @@ services:
       - "${TIMESCALEDB_PORT}:5442"
     environment:
       POSTGRES_DB: ${TIMESCALEDB_DB}
-      POSTGRES_USER: ${TIMESCALEDB_DATABASE}
+      POSTGRES_USER: ${TIMESCALEDB_DB}
       POSTGRES_PASSWORD: ${TIMESCALEDB_PASSWORD}
     volumes:
       - fems_timescaledb:/var/lib/postgresql/data