diff --git a/Makefile b/Makefile
index 8befa812..4a48a520 100644
--- a/Makefile
+++ b/Makefile
@@ -24,11 +24,18 @@ test: stop
 format: 
 	docker-compose run --rm api bash -c "mix format && mix credo --strict"
 	@bash docker/message.sh "Code is now ready to commit :)"
-start-dev:
-	@bash docker/message.sh "Frontend (dev)"
+
+dev: dev-setup dev-start
+dev-start: dev-stop
+	@bash docker/message.sh "Start development server"
 	docker-compose -f ./docker-compose.dev.yml up -d api
 	docker-compose -f ./docker-compose.dev.yml exec api bash -c 'yarn --cwd "js"; yarn --cwd "js" serve'
-setup-dev:
-	@bash docker/message.sh "Frontend (dev)"
+dev-setup: dev-stop
+	@bash docker/message.sh "Setup dependencies"
 	docker-compose -f ./docker-compose.dev.yml run --rm api bash -c 'mix deps.get; mix ecto.create; mix ecto.migrate'
+dev-stop:
+	@bash docker/message.sh "Stopping Mobilizon"
+	docker-compose -f ./docker-compose.dev.yml down
+	@bash docker/message.sh "Mobilizon is stopped"
+
 target: init