diff --git a/templates/compose/sparkyfitness.yaml b/templates/compose/sparkyfitness.yaml
index e9f04071c..b955fd5a4 100644
--- a/templates/compose/sparkyfitness.yaml
+++ b/templates/compose/sparkyfitness.yaml
@@ -42,9 +42,10 @@ services:
   sparkyfitness-db:
     image: 'postgres:15-alpine'
     environment:
-      POSTGRES_DB: '${SPARKY_FITNESS_DB_NAME:-sparkyfitness}'
-      POSTGRES_USER: '${SERVICE_USER_POSTGRES}'
-      POSTGRES_PASSWORD: '${SERVICE_PASSWORD_POSTGRES}'
+      - 'POSTGRES_DB=${SPARKY_FITNESS_DB_NAME:-sparkyfitness}'
+      - 'POSTGRES_USER=${SERVICE_USER_POSTGRES}'
+      - 'POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}'
+      - POSTGRES_PORT=${SPARKY_FITNESS_DB_PORT:-5432}
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
       interval: 5s