diff --git a/docker-compose.yml b/docker-compose.yml
index edbd60c..d810e80 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -46,7 +46,7 @@ services:
             }'
       JAVA_TOOL_OPTIONS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005"
     networks:
-       - bookstore-network
+      - bookstore-network
 
 volumes:
   mysql_data:
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 872249a..d316b7e 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,8 +1,9 @@
 spring.application.name=bookstore
 
-spring.datasource.url=jdbc:mysql://localhost:${MYSQL_DOCKER_PORT}/${MYSQL_DATABASE}?serverTimezone=UTC
-spring.datasource.username=root
-spring.datasource.password=${MYSQL_ROOT_PASSWORD}
+spring.datasource.url=jdbc:mysql://\
+  localhost:${MYSQLDB_DOCKER_PORT}/${MYSQLDB_DATABASE}?serverTimezone=UTC
+spring.datasource.username=${MYSQLDB_USERNAME}
+spring.datasource.password=${MYSQLDB_ROOT_PASSWORD}
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 spring.jpa.hibernate.ddl-auto=validate