diff --git a/src/main/java/org/hbp/mip/configuration/PersistenceConfiguration.java b/src/main/java/org/hbp/mip/configuration/PersistenceConfiguration.java
index 7e0791611fcc8e865d870f2273c8bc13b6e8a5b1..99beea7bb52c3fc68d24ae053ff60348aaec0741 100644
--- a/src/main/java/org/hbp/mip/configuration/PersistenceConfiguration.java
+++ b/src/main/java/org/hbp/mip/configuration/PersistenceConfiguration.java
@@ -1,8 +1,8 @@
 package org.hbp.mip.configuration;
 
 import org.hbp.mip.utils.CSVUtil;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.orm.jpa.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -24,18 +24,6 @@ import java.util.Properties;
 @EntityScan(basePackages = "org.hbp.mip.model")
 public class PersistenceConfiguration {
 
-    @Value("#{'${spring.datasource.username:postgres}'}")
-    String dbUser;
-
-    @Value("#{'${spring.datasource.password:pass}'}")
-    String dbPass;
-
-    @Value("#{'${spring.datasource.url:jdbc:postgresql://db:5432/postgres}'}")
-    String dbUrl;
-
-    @Value("#{'${spring.datasource.driver-class-name:org.postgresql.Driver}'}")
-    String dbDriver;
-
     @Bean
     public CSVUtil csvUtil() {
         return new CSVUtil();
@@ -57,15 +45,12 @@ public class PersistenceConfiguration {
         return properties;
     }
 
+    @ConfigurationProperties("spring.datasource")
     @Bean
     @Primary
     public DataSource dataSource() {
         return DataSourceBuilder
                 .create()
-                .username(dbUser)
-                .password(dbPass)
-                .url(dbUrl)
-                .driverClassName(dbDriver)
                 .build();
     }
 }