diff --git a/Makefile b/Makefile
index ab71d33..5181763 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,12 @@
-.PHONY: server analytics
+.PHONY: server analytics compose
+
+all: server analytics
 
 server:
-	 docker build . -f Dockerfile_server
+	 docker build server -t hastic-server
 
 analytics:
-	 docker build . -f Dockerfile_analytics
+	 docker build analytics -t hastic-analytics
 
-all: server analytics
+compose:
+	 docker-compose up