diff --git a/Makefile b/Makefile
index bfe79df..b7789cb 100644
--- a/Makefile
+++ b/Makefile
@@ -177,7 +177,8 @@ runners: runners-clean runners-build runners-push
 # -----------------------------------------------------------------------------
 
 clean-all:
-	docker rmi $(shell docker images -q) || /bin/true
+	yes | docker container prune
+	yes | docker image prune -a
 
 clean-builds: \
 	wiki-clean \