diff --git a/api-customer/src/controllers/mqtt_forwarder.py b/api-customer/src/controllers/mqtt_forwarder.py
index 25a86b28..7760eb71 100644
--- a/api-customer/src/controllers/mqtt_forwarder.py
+++ b/api-customer/src/controllers/mqtt_forwarder.py
@@ -1,6 +1,5 @@
 from src.services.mqtt_service import MQTTService
 
-
 class MQTTForwarder:
 
     client_id : str
diff --git a/api/compose.yaml b/api/compose.yaml
index 8fe0b879..a0aa2263 100644
--- a/api/compose.yaml
+++ b/api/compose.yaml
@@ -14,7 +14,8 @@ services:
       BROKER_PASSWORD: "hepl"
       JWT_SECRET: "enY3OWU4djFyMTByNTZhcG9uY3Z0djQ5cnY0eDhhNWM0bjg5OTRjNDhidA=="
       SSL_KEYSTORE_PATH: "/certs/keystore.p12"
-      SPRING_DATA_MONGODB_URI: "mongodb://board-mate-user:apx820kcng@mongodb:27017/board-mate-db"
+      MONGODB_URI: "mongodb://board-mate-user:apx820kcng@mongodb:27017/board-mate-db"
+      MONGO_DATABASE: "board-mate-db"
       JAVA_TOOL_OPTIONS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005"
     depends_on:
       - mongodb
diff --git a/api/src/main/resources/application.properties b/api/src/main/resources/application.properties
index 8d339cff..b8b5d69f 100644
--- a/api/src/main/resources/application.properties
+++ b/api/src/main/resources/application.properties
@@ -38,5 +38,5 @@ springdoc.swagger-ui.path=/docs
 springdoc.api-docs.path=/v1/docs
 
 #=============DATABASE=============
-spring.mongodb.uri=mongodb://board-mate-user:apx820kcng@mongodb:27017/board-mate-db?authSource=board-mate-db
-spring.mongodb.database=board-mate-db
\ No newline at end of file
+spring.mongodb.uri=${SPRING_DATA_MONGODB_URI}
+spring.mongodb.database=${MONGO_DATABASE}
\ No newline at end of file