diff --git a/image-builder/image_builder.sh b/image-builder/image_builder.sh
index 0b78de3575..27cd12c053 100755
--- a/image-builder/image_builder.sh
+++ b/image-builder/image_builder.sh
@@ -98,6 +98,7 @@ if [ -n "${USE_DOCKER}" ] ; then
 	# In case Clear Containers Runtime is installed we dont want to hit issue:
 	#https://github.com/clearcontainers/runtime/issues/828
 	docker run  \
+		--rm \
 		--runtime runc  \
 		--privileged \
 		--env IMG_SIZE="${IMG_SIZE}" \
diff --git a/rootfs-builder/rootfs.sh b/rootfs-builder/rootfs.sh
index 86b357f0b7..9879963260 100755
--- a/rootfs-builder/rootfs.sh
+++ b/rootfs-builder/rootfs.sh
@@ -212,6 +212,7 @@ if [ -n "${USE_DOCKER}" ] ; then
 	# In case Clear Containers Runtime is installed we dont want to hit issue:
 	#https://github.com/clearcontainers/runtime/issues/828
 	docker run  \
+		--rm \
 		--runtime runc  \
 		--env https_proxy="${https_proxy}" \
 		--env http_proxy="${http_proxy}" \