diff --git a/helm/values.yaml b/helm/values.yaml
index 282087e..5976261 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -74,7 +74,7 @@ deployments:
     port: *apiPort
     replicas: 3
     initContainer:
-      command: ['/bin/sh', '-c', 'until nc -z exam-db 5432; do sleep 1; done;']
+      command: ['/bin/sh', '-c', 'until nc -z exam-db "${EXAM_DB_SERVICE_PORT-5432}"; do sleep 1; done;']
       # cmd: ['sh', '-c', 'until pg_isready -U username -h exam-db -p 5432; do sleep 1; done']
   - client:
     name: *clientName
@@ -98,4 +98,4 @@ deployments:
     mountPath: /var/lib/postgresql/data
     storage: pv-storage
     probe:
-      command: ['/bin/sh', '-c', 'exec pg_isready -U "$(POSTGRES_USER)" -h 127.0.0.1 -p 5432;']
+      command: ['/bin/sh', '-c', 'exec pg_isready -U "$POSTGRES_USER" -h 127.0.0.1 -p "${EXAM_DB_SERVICE_PORT-5432}";']