diff --git a/script/build-docs b/script/build-docs
index cafba23f5..abcaec4a8 100755
--- a/script/build-docs
+++ b/script/build-docs
@@ -1,5 +1,5 @@
 #!/bin/bash
 set -ex
 pushd docs
-fig run jekyll jekyll build
+fig run --rm jekyll jekyll build
 popd
diff --git a/script/build-linux b/script/build-linux
index b7b6edf5d..f7b99210b 100755
--- a/script/build-linux
+++ b/script/build-linux
@@ -3,6 +3,6 @@ set -ex
 mkdir -p `pwd`/dist
 chmod 777 `pwd`/dist
 docker build -t fig .
-docker run -u user -v `pwd`/dist:/code/dist --entrypoint pyinstaller fig -F bin/fig
+docker run -u user -v `pwd`/dist:/code/dist --rm --entrypoint pyinstaller fig -F bin/fig
 mv dist/fig dist/fig-Linux-x86_64
-docker run -u user -v `pwd`/dist:/code/dist --entrypoint dist/fig-Linux-x86_64 fig --version
+docker run -u user -v `pwd`/dist:/code/dist --rm --entrypoint dist/fig-Linux-x86_64 fig --version
diff --git a/script/test b/script/test
index 54c2077f4..e73ba893d 100755
--- a/script/test
+++ b/script/test
@@ -1,5 +1,5 @@
 #!/bin/sh
 set -ex
 docker build -t fig .
-docker run -v /var/run/docker.sock:/var/run/docker.sock --entrypoint flake8 fig fig
-docker run -v /var/run/docker.sock:/var/run/docker.sock --entrypoint nosetests fig $@
+docker run -v /var/run/docker.sock:/var/run/docker.sock --rm --entrypoint flake8 fig fig
+docker run -v /var/run/docker.sock:/var/run/docker.sock --rm --entrypoint nosetests fig $@