diff --git a/docker-compose.yml b/docker-compose.yml
index 27e494c..72a27bf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,6 +18,8 @@ services:
     ports:
       - "80:8080"
     environment:
+      BITWARDENRS_WAIT_FOR_HOST: bitwardenrs_postgres
+      BITWARDENRS_WAIT_FOR_PORT: 5432
       BITWARDENRS_DATABASE_URL: postgresql://user:pass@bitwardenrs_postgres:5432/bitwarden
       BITWARDENRS_ADMIN_TOKEN: test
 
diff --git a/overlay/usr/local/bin/entrypoint b/overlay/usr/local/bin/entrypoint
index 62a2e28..f7e0d73 100755
--- a/overlay/usr/local/bin/entrypoint
+++ b/overlay/usr/local/bin/entrypoint
@@ -3,9 +3,11 @@ set -eo pipefail
 
 /usr/local/bin/gomplate -V -o /app/.env -f /etc/templates/env.tmpl
 
-if [ -z "$BITWARDENRS_WAIT_FOR_HOST" ] && [ -z "$BITWARDENRS_WAIT_FOR_PORT" ]
+if [ ! -z "$BITWARDENRS_WAIT_FOR_HOST" ] && [ ! -z "$BITWARDENRS_WAIT_FOR_PORT" ]
 then
-  exec /app/bitwarden_rs
-else
-  exec ${BITWARDENRS_WAIT_FOR_HOST}:${BITWARDENRS_WAIT_FOR_PORT} -- /app/bitwarden_rs
+  printf "Wait for ${BITWARDENRS_WAIT_FOR_HOST}:${BITWARDENRS_WAIT_FOR_PORT} ...\n"
+  /usr/local/bin/wait-for ${BITWARDENRS_WAIT_FOR_HOST}:${BITWARDENRS_WAIT_FOR_PORT}
 fi
+
+printf "Start Bitwarden Server ...\n"
+exec /app/bitwarden_rs