diff --git a/xos/configurations/devel/Makefile b/xos/configurations/devel/Makefile
index 402309b..2aaec54 100644
--- a/xos/configurations/devel/Makefile
+++ b/xos/configurations/devel/Makefile
@@ -49,5 +49,7 @@
 
 cleanup_docker: rm
 	sudo docker rm -v $(docker ps -a -q -f status=exited) || true
-	sudo docker rmi $(docker images -f "dangling=true" -q) || true
+	docker rm -v $(docker ps -a -q -f status=exited) || true
+	sudo docker rmi $(docker images -qf "dangling=true") || true
+	docker rmi $(docker images -qf "dangling=true") || true
 	sudo docker run -v /var/run/docker.sock:/var/run/docker.sock -v /var/lib/docker:/var/lib/docker --rm martin/docker-cleanup-volumes || true