diff --git a/docker-compose.yml b/docker-compose.yml
index e360a12288a2aea54576d9d9a655da0fca0b5674..85c9335861f4fef71b7a96a90bde3a96dd1d20b0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,9 +11,9 @@ services:
     ports:
       - 5432:5432
     environment:
-         - POSTGRES_PASSWORD=postgres
-         - POSTGRES_USER=postgres
-         - POSTGRES_DB=dashboarddb
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_USER=postgres
+      - POSTGRES_DB=dashboarddb
     networks:
       - urbanite-network
 
@@ -27,6 +27,8 @@ services:
       - SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/dashboarddb
       - IDM_USER4VIEW_USERNAME=urbanite
       - IDM_USER4VIEW_PASSWORD=urbanite
+      - POSTGRES_USERNAME=postgres
+      - POSTGRES_PASSWORD=postgres
     #expose:
     #  - 8085
     ports:
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 6c3879c9952de562470c031772694e6f961873db..988f0ceb3fda4d25bce9319a1023765a2356fa7e 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -5,8 +5,8 @@ server.port=8085
 spring.datasource.url=jdbc:postgresql://localhost:5432/dashboarddb
 spring.datasource.driver-class-name=org.postgresql.Driver
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
-spring.datasource.username=postgres
-spring.datasource.password=postgres
+spring.datasource.username=${POSTGRES_USERNAME:postgres}
+spring.datasource.password=${POSTGRES_PASSWORD:postgres}
 spring.jpa.show-sql=true
 spring.jpa.generate-ddl=true
 #spring.jpa.hibernate.ddl-auto=create