diff --git a/utils/clean_docker.sh b/utils/clean_docker.sh
index eaca9c25813eb2ca77f9957e0c3f66aa034df363..ac85f15a8e3c2f33309e05642443d49c084dd311 100755
--- a/utils/clean_docker.sh
+++ b/utils/clean_docker.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
-docker rm `docker ps -a -q`
-docker rmi `docker images -a -q`
-/opt/bin/docker-volumes rm `/opt/bin/docker-volumes list | grep docker | cut -d"|" -f1`
+docker rm -v $(docker ps -a -q -f status=exited)
+
+docker rmi $(docker images -f "dangling=true" -q)
+
+docker run -v /var/run/docker.sock:/var/run/docker.sock -v /var/lib/docker:/var/lib/docker --rm martin/docker-cleanup-volumes