diff --git a/api/docker-compose.yml b/api/docker-compose.yml
index 755df6de7ec607cc8422bb109785014834f0be17..2d9c575be05ba745b8d8338d5b474a1e2adb01f8 100644
--- a/api/docker-compose.yml
+++ b/api/docker-compose.yml
@@ -6,8 +6,9 @@ services:
     ports:
       - ${MQTT_PORT}:1883
     volumes:
-      - ./broker/mosquitto.conf:/mosquitto/config/mosquitto.conf
-      - ./broker/mosquitto.passwd:/mosquitto/config/mosquitto.passwd
+      - ./mqtt/mosquitto.conf:/mosquitto/config/mosquitto.conf
+      - ./mqtt/mosquitto.passwd:/mosquitto/config/mosquitto.passwd
+    restart: always
 
   web:
     container_name: go
diff --git a/api/mqtt/mqttBroker.go b/api/mqtt/mqttBroker.go
index 2c0b5c326d83ee618177e27c6e65fbcf6c536c4e..b9a0e6166a15b9dabd7321b0546bea88aee990d7 100644
--- a/api/mqtt/mqttBroker.go
+++ b/api/mqtt/mqttBroker.go
@@ -59,8 +59,8 @@ func InitializeMQTTClient() {
 	opts := mqtt.NewClientOptions()
 	opts.AddBroker(fmt.Sprintf("tcp://%s:%d", broker, port))
 	opts.SetClientID("BLE-Parser")
-	opts.SetUsername("admin")
-	opts.SetPassword("admin")
+	opts.SetUsername("stillasTracker")
+	opts.SetPassword("stillasTracker")
 	opts.OnConnect = connectHandler
 	opts.OnConnectionLost = connectLostHandler
 	client := mqtt.NewClient(opts)