diff --git a/admin-server/README.md b/admin-server/README.md
index 0ff5d132..dc681041 100644
--- a/admin-server/README.md
+++ b/admin-server/README.md
@@ -8,9 +8,9 @@ API
 
 Add environment file (.env) with following properties
 ```
-DATABASE_USER=<USER>
-DATABASE_PASSWORD=<PAsSWORD>
-DATABASE_NAME=<NAME>
+DATASOURCE_USER=<USER>
+DATASOURCE_PASSWORD=<PASSWORD>
+DATASOURCE_URL=<URL>
 ```
 
 To build
diff --git a/admin-server/src/main/resources/application.properties b/admin-server/src/main/resources/application.properties
index 8844bedb..c87c6311 100644
--- a/admin-server/src/main/resources/application.properties
+++ b/admin-server/src/main/resources/application.properties
@@ -1,8 +1,8 @@
 spring.application.name=OpenID Federation
 
-spring.datasource.url=jdbc:postgresql://localhost:5432/${DATABASE_NAME}
-spring.datasource.username=${DATABASE_USER}
-spring.datasource.password=${DATABASE_PASSWORD}
+spring.datasource.url=${DATASOURCE_URL}
+spring.datasource.username=${DATASOURCE_USER}
+spring.datasource.password=${DATASOURCE_PASSWORD}
 spring.datasource.driver-class-name=org.postgresql.Driver
 
 # Mapping /actuator/health to /status
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index e3bb3de1..92efe779 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -5,9 +5,9 @@ services:
     image: postgres:latest
     container_name: postgres_db
     environment:
-      POSTGRES_USER: ${DATABASE_USER}
-      POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
-      POSTGRES_DB: ${DATABASE_NAME}
+      POSTGRES_USER: ${DATASOURCE_USER}
+      POSTGRES_PASSWORD: ${DATASOURCE_PASSWORD}
+      POSTGRES_DB: openid-federation-db
     ports:
       - "5432:5432"
     volumes: