diff --git a/config/bffh.dhall b/config/bffh/bffh.dhall
similarity index 100%
rename from config/bffh.dhall
rename to config/bffh/bffh.dhall
diff --git a/config/pass.toml b/config/bffh/pass.toml
similarity index 100%
rename from config/pass.toml
rename to config/bffh/pass.toml
diff --git a/config/roles.toml b/config/bffh/roles.toml
similarity index 100%
rename from config/roles.toml
rename to config/bffh/roles.toml
diff --git a/config/users.toml b/config/bffh/users.toml
similarity index 100%
rename from config/users.toml
rename to config/bffh/users.toml
diff --git a/config/mosquitto/mosquitto.conf b/config/mosquitto/mosquitto.conf
new file mode 100644
index 0000000..d33a1a7
--- /dev/null
+++ b/config/mosquitto/mosquitto.conf
@@ -0,0 +1,3 @@
+persistence true
+persistence_location /mosquitto/data/
+log_dest file /mosquitto/log/mosquitto.log
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 67d7643..33cd740 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -14,3 +14,8 @@ services:
       - mqtt
   mqtt:
     image: eclipse-mosquitto:1.6.13
+    restart: always
+    ports:
+      - "1883:1883"
+    volumes:
+      - "./config/mosquitto/mosquitto.conf:/mosquitto/config/mosquitto.conf"