diff --git a/Makefile b/Makefile
index a44f2c92..97d39da4 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ build-all: ros-build-image
 
 
 installer: ros-build-image
-	./scripts/docker-run.sh make -f Makefile.docker FORCE_PULL=$(FORCE_PULL) $@
+	./scripts/docker-run.sh --rm make -f Makefile.docker FORCE_PULL=$(FORCE_PULL) $@
 
 
 version:
diff --git a/scripts/docker-run.sh b/scripts/docker-run.sh
index 4993ab9b..e352bf34 100755
--- a/scripts/docker-run.sh
+++ b/scripts/docker-run.sh
@@ -12,5 +12,25 @@ if [ -c /dev/kvm ] || [ "${PRIVILEGED}" == "1" ]; then
     DOCKER_ARGS="${DOCKER_ARGS} --privileged"
 fi
 
-docker rm -fv ros-build >/dev/null 2>&1 || true
-exec docker run -i -v /var/run/docker.sock:/var/run/docker.sock $DOCKER_ARGS --name=ros-build ros-build "$@"
+NAME=ros-build
+while [ "$#" -gt 0 ]; do
+    case $1 in
+        --name)
+            shift 1
+            NAME="$1"
+            ;;
+        --rm)
+            NAME=$(mktemp ${NAME}-XXXXXX)
+            rm $NAME
+            DOCKER_ARGS="${DOCKER_ARGS} --rm"
+            ;;
+        *)
+            break
+            ;;
+    esac
+    shift 1
+done
+
+DOCKER_ARGS="${DOCKER_ARGS} --name=${NAME}"
+docker rm -fv ${NAME} >/dev/null 2>&1 || true
+exec docker run -i -v /var/run/docker.sock:/var/run/docker.sock $DOCKER_ARGS ros-build "$@"