diff --git a/Makefile b/Makefile
index 526a08a..e008056 100644
--- a/Makefile
+++ b/Makefile
@@ -78,6 +78,7 @@ bin/$(ARCH)/$(BIN): build-dirs
 	@echo "building: $@"
 	@docker run                                                            \
 	    -ti                                                                \
+	    --rm                                                               \
 	    -u $$(id -u):$$(id -g)                                             \
 	    -v $$(pwd)/.go:/go                                                 \
 	    -v $$(pwd):/go/src/$(PKG)                                          \
@@ -122,6 +123,7 @@ version:
 test: build-dirs
 	@docker run                                                            \
 	    -ti                                                                \
+	    --rm                                                               \
 	    -u $$(id -u):$$(id -g)                                             \
 	    -v $$(pwd)/.go:/go                                                 \
 	    -v $$(pwd):/go/src/$(PKG)                                          \