diff --git a/.env.development b/.env.development
index 3a8bbd1..5231a2c 100644
--- a/.env.development
+++ b/.env.development
@@ -38,8 +38,8 @@ POSTGRES_PASSWORD=wacefems-pg-password-PPw09!keep
 # TimescaleDB
 TIMESCALEDB_HOST=fems-timescaledb
 TIMESCALEDB_PORT=5433
-TIMESCALEDB_DB=fems_timeseries_db
-TIMESCALEDB_USER=wacefems-tsdb-user
+TIMESCALEDB_DB=fems_timeseries
+TIMESCALEDB_USER=fems_user
 TIMESCALEDB_PASSWORD=wacefems-tsdb-password-PPw09!keep
 
 # Redis
diff --git a/fems-timescaledb/pg_hba.conf b/fems-timescaledb/pg_hba.conf
index 0e7388e..8181c10 100644
--- a/fems-timescaledb/pg_hba.conf
+++ b/fems-timescaledb/pg_hba.conf
@@ -12,4 +12,4 @@ host    all             all             172.16.0.0/12          scram-sha-256
 host    all             all             192.168.0.0/16         scram-sha-256
 host    all             all             10.0.0.0/8             scram-sha-256
 # Allow connections from specific users
-host    fems_timescaledb   fems_user       all                    scram-sha-256
\ No newline at end of file
+host    fems_timeseries   fems_user       all                    scram-sha-256
\ No newline at end of file