diff --git a/Makefile b/Makefile
index b9b40c6677..ee952cddb4 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ env-update-image:					## Pull latest dev image
 
 env-compose-up: env-update-image
 	COMPOSE_PROFILES=$(PROFILES) \
-	docker compose up --detach --renew-anon-volumes --remove-orphans --wait --wait-timeout 250
+	docker compose up --detach --renew-anon-volumes --remove-orphans --wait --wait-timeout 100 --exit-code-from pmm-server
 
 env-devcontainer:
 	docker exec -it --workdir=/root/go/src/github.com/percona/pmm pmm-server .devcontainer/setup.py