diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index d615e99..723e2ca 100644
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -41,7 +41,7 @@
                 dialect: org.hibernate.dialect.PostgreSQLDialect
 
     datasource:
-        url: jdbc:postgresql://${DB_HOST}:5432/cpsdb
+        url: jdbc:postgresql://${DB_HOST}:${DB_PORT:5432}/cpsdb
         username: ${DB_USERNAME}
         password: ${DB_PASSWORD}
         driverClassName: org.postgresql.Driver