diff --git a/Makefile b/Makefile
index f73dd01a6..9e882fccb 100644
--- a/Makefile
+++ b/Makefile
@@ -69,13 +69,18 @@ clean:
 	-rm -rf .stack-work .stack-work.lock
 	-rm -rf bin .Dockerfile develop
 	-$(CONTAINER_COMMAND) container prune --force
-.PHONY: clean-all
-# HELP: like clean but with full container, image, and volume prune
-clean-all: clean
-	-rm -rf .stack
+.PHONY: clean-images
+# HELP: stop all running containers and clean all images from local repositories
+clean-images:
+	rm -rf develop
+	sleep 5
 	-$(CONTAINER_COMMAND) system prune --all --force --volumes
 	-$(CONTAINER_COMMAND) image prune --all --force
 	-$(CONTAINER_COMMAND) volume prune --force
+.PHONY: clean-all
+# HELP: like clean but with full container, image, and volume prune
+clean-all: clean-images
+	-rm -rf .stack
 
 .PHONY: release
 # HELP: create, commit and push a new release