diff --git a/run.sh b/run.sh
index 4dc85dc16cce4068bda87ac0f34f4701adff2e31..5d9339d5dd5ee1458a5d47d420904917ac0cef13 100755
--- a/run.sh
+++ b/run.sh
@@ -1,4 +1,12 @@
 #!/usr/bin/env bash
 
 docker-compose build
-docker-compose up -d
+docker-compose up -d db
+
+echo 'Waiting for database to be ready...'
+until [ $(docker-compose exec db psql -U postgres -c "\q" | wc -l) -eq 0 ]; do
+    printf '.'
+    sleep 1
+done
+
+docker-compose up -d backend