diff --git a/Makefile b/Makefile
index 6cc281d2..77985606 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,38 @@
+.PHONY: build
 build:
 	cd cmd/proxy && buffalo build
 
+.PHONY: run
 run: build
 	./athens
-	
+
+.PHONY: cli	
 cli:
 	go build -o athens ./cmd/cli
 
+.PHONY: docs
 docs:
 	cd docs && hugo
 
+.PHONY: test
 test:
 	cd cmd/proxy && buffalo test
 	cd cmd/olympus && buffalo test
 
+.PHONY: olympus-docker
 olympus-docker:
 	docker build -t gopackages/olympus -f cmd/olympus/Dockerfile .
 
+.PHONY: dev
 dev:
-	# TODO: spin up all the services :)
-	# need to create an umbrella service in
-	# the docker compose file that declares all the
-	# deps
 	docker-compose -p athensdev up -d mysql
+	docker-compose -p athensdev up -d postgres
+	docker-compose -p athensdev up -d mongo
+	docker-compose -p athensdev up -d redis
+	docker-compose -p athensdev up -d minio
 	echo "sleeping for a bit to wait for the DB to come up"
 	sleep 5
+
+.PHONY: dev-teardown
+dev-teardown:
+	docker-compose -p athensdev down