diff --git a/Dockerfile b/Dockerfile
index c5709b8..dcb496b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ COPY requirements.txt .
 RUN \
  apt-get update && \
  apt-get upgrade -y && \
- apt-get install -y libpq-dev python3-dev && \
+ apt-get install -y libpq-dev python3-dev postgresql-client && \
  python3 -m pip install --upgrade pip && \
  python3 -m pip install -r requirements.txt --no-cache-dir && \
  apt-get autoclean && \
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 97b663c..ac5efe2 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -3,7 +3,7 @@
 set -e
 
 echo "DB init..."
-until psql -h db -U root -c '\l' &>/dev/null; do
+while psql -h db 2>&1 | grep -q 'could not connect to server'; do
   >&2 echo "Waiting for PostgreSQL to boot up"
   sleep 1
 done
@@ -12,3 +12,5 @@ echo "DB setup: makemigrations..."
 echo "DB setup: migrate..."
 python3 manage.py makemigrations --noinput
 python3 manage.py migrate --noinput
+
+exec "$@"