diff --git a/Makefile b/Makefile
index 2a9f749ba2b63b4b0a35c3231db54a6ea6977176..b5ee9911a886b56f44eb6e11d5481e8db5d514da 100644
--- a/Makefile
+++ b/Makefile
@@ -20,10 +20,12 @@ dialyzer:
 release:
 	@$(REBAR) release
 
-image:
-	@$(REBAR) do tar
-	REL_VSN=$(shell relinfo.escript -vsn _build/default/rel/consul_proxy/releases/RELEASES) envsubst '$$REL_VSN' < apps/consul_proxy/priv/Dockerfile > _build/default/Dockerfile
-	docker build -t hedenstroem/consul_proxy -f _build/default/Dockerfile _build/default
+tarball:
+	@$(REBAR) as production do tar
+
+image: tarball
+	@REL_VSN=$(shell relinfo.escript -vsn _build/production/rel/consul_proxy/releases/RELEASES) envsubst '$$REL_VSN' < apps/consul_proxy/priv/Dockerfile > _build/production/Dockerfile
+	@docker build -t erlangninja/consul_proxy -f _build/production/Dockerfile _build/production
 
 edoc:
 	@$(REBAR) edoc
@@ -32,7 +34,7 @@ clean:
 	@$(REBAR) clean
 
 distclean:
-	@rm -rf _build rebar.lock log $(REBAR)
+	@rm -rf _build log $(REBAR)
 
 shell:
 	@$(REBAR) shell --config=config/test-sys.config