diff --git a/Makefile b/Makefile
index 5822ae6..c16fb38 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,28 @@
-REBAR = $(shell which rebar3 || echo ./rebar3)
+REBAR = ./rebar #$(shell which rebar || echo ./rebar)
 ENABLE_STATIC = no
 
-all:
-	ENABLE_STATIC=$(ENABLE_STATIC) $(REBAR) compile
+all: deps-up guam
+
+deps:
+	$(REBAR) get-deps
 
-clean:
-	$(REBAR) clean
+deps-up: deps
+	$(REBAR) update-deps
+
+guam:
+	ENABLE_STATIC=$(ENABLE_STATIC) $(REBAR) compile
 
 run:
-	$(REBAR) shell --config app.config
+	erl -pa apps/*/ebin deps/*/ebin -config app -s kolab_guam
 
 release:
-	$(REBAR) release
+	$(REBAR) compile generate
 
 test.spec: test.spec.in cover.spec.in
 	cat test.spec.in | sed -e "s,@PATH@,$(PWD)," > $(PWD)/test.spec
 	cat cover.spec.in | sed -e "s,@PATH@,$(PWD)," > $(PWD)/cover.spec
 
 
 test: test.spec guam
 	mkdir -p test_logs
 	ct_run -pa $(PWD)/apps/*/ebin -pa $(PWD)/deps/*/ebin -spec test.spec -erl_args -config $(PWD)/apps/kolab_guam/test/test.config -s kolab_guam