diff --git a/Makefile b/Makefile
index f207923..9f8e9e5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
+SUDO ?= $(shell if ! groups | grep -q docker; then echo sudo; fi)
+
 build : 
-	docker build -t flan_scan .
+	$(SUDO) docker build -t flan_scan .
 
 container_name = flan_$(shell date +'%s')
 start : 
-	docker run --name $(container_name) -v $(shell pwd)/shared:/shared flan_scan
+	$(SUDO) docker run --rm --name $(container_name) -v $(shell pwd)/shared:/shared flan_scan