diff --git a/docker-compose.yml b/docker-compose.yml
index 10f645e..820a6b3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,17 +20,17 @@ services:
       retries: 3
       start_period: 10s
 
-  java-api:
-    container_name: java-api
+  server:
+    container_name: server
     depends_on:
-      postgres:
+      db:
         condition: service_started
     environment:
       POSTGRES_DB: tasknote
-      POSTGRES_HOST: postgres
+      POSTGRES_HOST: db
       POSTGRES_USER: tasknoteuser
       POSTGRES_PASSWORD: default
-      POSTGRES_PORT: 5432
+      POSTGRES_PORT: 5435
     ports:
       - "8585:8585"
       - "5005:5005"
@@ -47,20 +47,19 @@ services:
       retries: 3
       start_period: 10s
 
-  postgres:
-    container_name: postgres
+  db:
+    container_name: db
     image: postgres:15.8-bookworm
     environment:
       POSTGRES_DB: tasknote
-      POSTGRES_HOST: postgres
       POSTGRES_USER: tasknoteuser
       POSTGRES_PASSWORD: default
-      POSTGRES_PORT: 5432
+      POSTGRES_PORT: 5435
       PGDATA: /tmp
     volumes:
       - "./data:/tmp"
     ports:
-      - "5432:5432"
+      - "5435:5432"
     healthcheck:
       test: psql -q -U $${POSTGRES_USER} -d $${POSTGRES_DB} -c 'SELECT 1'
       interval: 1m30s
diff --git a/java-api/src/main/resources/application.properties b/java-api/src/main/resources/application.properties
index 37afea4..4985f1a 100644
--- a/java-api/src/main/resources/application.properties
+++ b/java-api/src/main/resources/application.properties
@@ -7,7 +7,7 @@ management.endpoint.health.show-details=always
 
 # Database, datasource and JPA
 spring.datasource.driver-class-name=org.postgresql.Driver
-spring.datasource.url=jdbc:postgresql://${POSTGRES_HOST:localhost}:5432/${POSTGRES_DB:tasknote}
+spring.datasource.url=jdbc:postgresql://${POSTGRES_HOST:localhost}:${POSTGRES_PORT:5435}/${POSTGRES_DB:tasknote}
 spring.datasource.username=${POSTGRES_USER:tasknoteuser}
 spring.datasource.password=${POSTGRES_PASSWORD:default}
 spring.jpa.properties.hibernate.default_schema=tasknote