diff --git a/Makefile b/Makefile
index dfe01f1..914a515 100644
--- a/Makefile
+++ b/Makefile
@@ -4,31 +4,24 @@ NODE=/usr/local/bin/node
 NPM=/usr/local/bin/npm
 IMAGE=joaodubas/nodejs-unstable:latest
 NAME=generator
-CMD=docker run -i -t -v $(ROOT):$(DEST) -w $(DEST) -name $(NAME)
+CMD=docker run -i -t --rm -v $(ROOT):$(DEST) -w $(DEST) --name $(NAME)
 
 shell:
 	@$(CMD) \
-		-entrypoint $(NODE) \
+		--entrypoint $(NODE) \
 		$(IMAGE) \
 		--harmony
-	@$(MAKE) kill
 
 run:
 	@$(CMD) \
-		-entrypoint $(NODE) \
+		--entrypoint $(NODE) \
 		$(IMAGE) \
 		--harmony bin/$(file)
-	@$(MAKE) kill
 
 install:
 	@$(CMD) \
-		-entrypoint $(NPM) \
+		--entrypoint $(NPM) \
 		$(IMAGE) \
 		install $(pack)
-	@$(MAKE) kill
 
-kill:
-	@/usr/bin/docker kill $(NAME)
-	@/usr/bin/docker rm $(NAME)
-
-.PHONY: shell run kill
+.PHONY: shell run