diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index c2fdc60ff87902114b96aeb567d468d0908af056..d50c2052a029d0f34d6d9a831216ca5788ed9ed2 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -10,10 +10,13 @@ server.port=8083
 
 spring.profiles.active=@spring.profiles.active@
 
+#Use ENV file
+spring.config.import=optional:file:.env[.properties]
+
 # datasource
-spring.datasource.url=jdbc:postgresql://postgres:5432/discs_names
-spring.datasource.username=discs_names
-spring.datasource.password=discs_names
+spring.datasource.url=${NAMING_DB_URL:jdbc:postgresql://postgres:5432/discs_names}
+spring.datasource.username=${NAMING_DB_USERNAME:discs_names}
+spring.datasource.password=${NAMING_DB_PASSWORD:discs_names}
 
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 spring.jpa.hibernate.ddl-auto=none