diff --git a/Makefile b/Makefile
index 919cbfaae7..1eada4b3d5 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,11 @@
 compose_build: .env
 	COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build
 
-up: create_database
+up:
+	docker compose up -d redis postgres
+	docker compose exec -u postgres postgres psql postgres --csv \
+		-1tqc "SELECT table_name FROM information_schema.tables WHERE table_name = 'organizations'" 2> /dev/null \
+		| grep -q "organizations" || make create_database
 	COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose up -d --build
 
 test_db: