diff --git a/Makefile b/Makefile
index cd008f20f..ae6e257e4 100644
--- a/Makefile
+++ b/Makefile
@@ -369,16 +369,21 @@ psql: --ensure-develop
 stop:
 	rm -rf develop
 .PHONY: stop-%
-# HELP(stop-{database,memcached,minio,backend,frontend,hoogle}): stop all currently running develop instances of a given type
-stop-%:
+# HELP(stop-SERVICE): stop all currently running develop instances of a given service (i.e. backend,frontend,uniworxdb,hoogle,postgres,...)
+# HELP(stop-JOB): stop all currently running develop instances of a given job (i.e. compile,start,test,lint)
+stop-compile: CF_PREFIX=compile-
+stop-start: CF_PREFIX=start-
+stop-test: CF_PREFIX=test-
+stop-lint: CF_PREFIX=lint-
+stop-%: --stop;
+--stop:
 	$(SET_DEVELOP)
-	rm -rf $(DEVELOP)/$*
-stop-container-by-file:
-	rm $(CONTAINER_FILE)
-stop-container-by-id:
-	$(CONTAINER_COMMAND) stop $(CONTAINER_ID)
-#	CONTAINER_ID=`grep 'CONTAINER_ID=' $(CONTAINER_FILE) | sed 's/CONTAINER_ID=//'` ; \
-#	$(MAKE) stop-container-by-id CONTAINER_ID=$${CONTAINER_ID}
+ifdef CF_PREFIX
+	rm -rf $(DEVELOP)/$(CF_PREFIX)*
+endif
+ifdef SERVICE_VARIANT
+	rm -rf $(DEVELOP)/*-$(SERVICE_VARIANT)
+endif
 
 .PHONY: new-develop
 # HELP: instantiate new development bundle, i.e. create new directory under develop/