diff --git a/docker-compose.db.yml b/docker-compose.db.yml
index eee68ed..dabc45e 100644
--- a/docker-compose.db.yml
+++ b/docker-compose.db.yml
@@ -51,11 +51,10 @@ services:
       - POSTGRES_DB=postgres
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=${TIMESCALEDB_PASSWORD}
-      - TIMESCALEDB_DB=${TIMESCALEDB_DB}
-      - TIMESCALEDB_USER=${TIMESCALEDB_USER}
+      - TIMESCALEDB_DB=${TIMESCALEDB_DB:-fems_timeseries}
+      - TIMESCALEDB_USER=${TIMESCALEDB_USER:-fems_user}
       - TIMESCALEDB_PASSWORD=${TIMESCALEDB_PASSWORD}
-      - LANG=C.UTF-8
-      - LC_ALL=C.UTF-8
+      - POSTGRES_INITDB_ARGS=--auth-host=scram-sha-256 --auth-local=scram-sha-256
     volumes:
       - fems_timescaledb:/var/lib/postgresql/data
       - ./fems-timescaledb/postgresql.conf:/etc/postgresql/postgresql.conf:ro
diff --git a/fems-mqtt/data/mosquitto.db b/fems-mqtt/data/mosquitto.db
index 6f0addc..59cdaae 100644
Binary files a/fems-mqtt/data/mosquitto.db and b/fems-mqtt/data/mosquitto.db differ
diff --git a/fems-timescaledb/pg_hba.conf b/fems-timescaledb/pg_hba.conf
index 7536043..f721061 100644
--- a/fems-timescaledb/pg_hba.conf
+++ b/fems-timescaledb/pg_hba.conf
@@ -1,16 +1,10 @@
 # fems-timescaledb/pg_hba.conf
-
 # TYPE  DATABASE        USER            ADDRESS                 METHOD
 # "local" is for Unix domain socket connections only
-local   all             all                                     trust
+local   all             all                                     scram-sha-256
 # IPv4 local connections:
 host    all             all             127.0.0.1/32            scram-sha-256
 # IPv6 local connections:
 host    all             all             ::1/128                 scram-sha-256
-# Allow all connections from Docker network
-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_timeseries   fems_user       all                    scram-sha-256
-
+# Allow all connections from anywhere
+host    all             all             0.0.0.0/0               scram-sha-256
\ No newline at end of file