diff --git a/Dockerfile b/Dockerfile
index 0bd34a5..2f0634c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ EXPOSE 4000
 # Get dependencies
 RUN \
     apk add --no-cache --virtual .tools \
-        git curl \
+        git curl postgresql-client \
     \
     && apk add --no-cache --virtual .sdk \
         build-base \
diff --git a/entrypoint.sh b/entrypoint.sh
index 6abb603..6f078d2 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -13,10 +13,17 @@ if [ -n "$BUILDTIME" ]; then
     exit 0
 fi
 
+set +x
+while ! pg_isready -U pleroma -d postgres://db:5432/pleroma -t 1; do
+    echo "[X] Database is starting up..."
+    sleep 1s
+done
+set -x
+
+# Recompile
 mix compile
 
 # Migrate db
-mix ecto.create
 mix ecto.migrate
 
 # Off we go!