diff --git a/tools/cleanup-containers b/tools/cleanup-containers
new file mode 100755
index 0000000000..7dace39368
--- /dev/null
+++ b/tools/cleanup-containers
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker rm $(docker ps -a -q)
diff --git a/tools/cleanup-images b/tools/cleanup-images
new file mode 100755
index 0000000000..4a0443e7d3
--- /dev/null
+++ b/tools/cleanup-images
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker rmi $(docker images -a -q)