diff --git a/Makefile b/Makefile
index 591c7172f..616d16290 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ format-check-ui:
 
 upgrade: build
 	$(COMPOSE) up -d postgres elasticsearch
-	sleep 10
+	$(COMPOSE) exec postgres pg_isready --timeout=30
 	$(APPDOCKER) aleph upgrade
 
 api: services