diff --git a/docker/docker-compose-arm64.yml b/docker/docker-compose-arm64.yml
index accdf1e..5e351c7 100644
--- a/docker/docker-compose-arm64.yml
+++ b/docker/docker-compose-arm64.yml
@@ -5,6 +5,7 @@ services:
     env_file: secrets.env
     environment:
       DB_HOST: "database"
+      DB_PORT: 5432
     volumes:
     - lbs:/lbs
 
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index c888d63..230be91 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -5,6 +5,7 @@ services:
     env_file: secrets.env
     environment:
       DB_HOST: "database"
+      DB_PORT: 5432
     volumes:
     - lbs:/lbs
 
diff --git a/docker/run.sh b/docker/run.sh
index 045d658..83661c6 100644
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 echo "********************************************************"
-echo "Waiting for the database server to start on port 5432"
+echo "Waiting for the database server to start on port ${DB_PORT:-5432}"
 echo "********************************************************"
-while ! `nc -z database 5432`; do sleep 3; done
+while ! `nc -z database ${DB_PORT:-5432}`; do sleep 3; done
 echo "******** Database Server has started "
 
 echo "********************************************************"
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index e7a872e..b5eca2e 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: "jdbc:postgresql://${DB_HOST:localhost}:5432/lbs"
+    url: "jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:5432}/lbs"
     username: "lbs"
     password: "lsb123"
   jpa: