diff --git a/api/mosquitto/config/init-mosquitto.sh b/api/mosquitto/config/init-mosquitto.sh
new file mode 100644
index 00000000..016f692d
--- /dev/null
+++ b/api/mosquitto/config/init-mosquitto.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+PASSWORD_FILE=/mosquitto/config/passwords
+
+echo "Creating password file with pre-registered users..."
+if [ ! -f "$PASSWORD_FILE" ]; then
+    touch "$PASSWORD_FILE"
+    chmod 600 "$PASSWORD_FILE"
+
+    # Add pre-registered users
+    mosquitto_passwd -b "$PASSWORD_FILE" board-mate-api hepl
+    echo "Password file created !"
+else
+    echo "Password file exists, skipping this step"
+fi
+
+echo "Starting mosquitto..."
+exec mosquitto -c /mosquitto/config/mosquitto.conf -v
diff --git a/api/mosquitto/data/mosquitto.db b/api/mosquitto/data/mosquitto.db
index 3ba16b63..a5d66eda 100644
Binary files a/api/mosquitto/data/mosquitto.db and b/api/mosquitto/data/mosquitto.db differ
diff --git a/api/mosquitto/log/mosquitto.log b/api/mosquitto/log/mosquitto.log
index 65daad02..e5d822d9 100644
--- a/api/mosquitto/log/mosquitto.log
+++ b/api/mosquitto/log/mosquitto.log
@@ -183,3 +183,49 @@ To fix this, use `chmod 0700 /mosquitto/config/passwords`.
 1766955294: Saving in-memory database to /mosquitto/data//mosquitto.db.
 1766955496: mosquitto version 2.0.22 terminating
 1766955496: Saving in-memory database to /mosquitto/data//mosquitto.db.
+1767024228: mosquitto version 2.0.22 starting
+1767024228: Config loaded from /mosquitto/config/mosquitto.conf.
+1767024228: Warning: File /mosquitto/config/passwords has world readable permissions. Future versions will refuse to load this file.
+To fix this, use `chmod 0700 /mosquitto/config/passwords`.
+1767024228: Opening ipv4 listen socket on port 1883.
+1767024228: Opening ipv6 listen socket on port 1883.
+1767024228: Opening websockets listen socket on port 9001.
+1767024228: Opening ipv4 listen socket on port 8883.
+1767024228: Opening ipv6 listen socket on port 8883.
+1767024228: mosquitto version 2.0.22 running
+1767025666: mosquitto version 2.0.22 terminating
+1767025666: Saving in-memory database to /mosquitto/data//mosquitto.db.
+1767025725: mosquitto version 2.0.22 starting
+1767025725: Config loaded from /mosquitto/config/mosquitto.conf.
+1767025725: Warning: File /mosquitto/config/passwords has world readable permissions. Future versions will refuse to load this file.
+To fix this, use `chmod 0700 /mosquitto/config/passwords`.
+1767025725: Opening ipv4 listen socket on port 1883.
+1767025725: Opening ipv6 listen socket on port 1883.
+1767025725: Opening websockets listen socket on port 9001.
+1767025725: Opening ipv4 listen socket on port 8883.
+1767025725: Opening ipv6 listen socket on port 8883.
+1767025725: mosquitto version 2.0.22 running
+1767027264: mosquitto version 2.0.22 terminating
+1767027264: Saving in-memory database to /mosquitto/data//mosquitto.db.
+1767027266: mosquitto version 2.0.22 starting
+1767027266: Config loaded from /mosquitto/config/mosquitto.conf.
+1767027266: Warning: File /mosquitto/config/passwords has world readable permissions. Future versions will refuse to load this file.
+To fix this, use `chmod 0700 /mosquitto/config/passwords`.
+1767027266: Opening ipv4 listen socket on port 1883.
+1767027266: Opening ipv6 listen socket on port 1883.
+1767027266: Opening websockets listen socket on port 9001.
+1767027266: Opening ipv4 listen socket on port 8883.
+1767027266: Opening ipv6 listen socket on port 8883.
+1767027266: mosquitto version 2.0.22 running
+1767027325: mosquitto version 2.0.22 terminating
+1767027325: Saving in-memory database to /mosquitto/data//mosquitto.db.
+1767027327: mosquitto version 2.0.22 starting
+1767027327: Config loaded from /mosquitto/config/mosquitto.conf.
+1767027327: Warning: File /mosquitto/config/passwords has world readable permissions. Future versions will refuse to load this file.
+To fix this, use `chmod 0700 /mosquitto/config/passwords`.
+1767027327: Opening ipv4 listen socket on port 1883.
+1767027327: Opening ipv6 listen socket on port 1883.
+1767027327: Opening websockets listen socket on port 9001.
+1767027327: Opening ipv4 listen socket on port 8883.
+1767027327: Opening ipv6 listen socket on port 8883.
+1767027327: mosquitto version 2.0.22 running