diff --git a/Makefile b/Makefile
index 5238b2be2..93352e4b7 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,11 @@ clean:
 	rm -rf node_modules .npm .cache assets/icons assets/favicons static well-known 
 	rm -rf .stack .stack-work .stack-work-build .stack-work-run .stack-work-test .stack-work-doc
 	rm -rf bin/ .Dockerfile .dev-port-http .dev-port-https
+.PHONY: clean-all
+clean-all: clean
+	$(CONTAINER_COMMAND) system prune --all --force --volumes
+	$(CONTAINER_COMMAND) image prune --all --force
+	$(CONTAINER_COMMAND) volume prune --force
 
 .PHONY: release
 release:
@@ -207,7 +212,7 @@ database-%:
 .PHONY: --containerized-database
 --containerized-database: FRADRIVE_SERVICE=database
 # port forwarding is disabled in --network=host mode; nevertheless it is stated here for documentation reasons
---containerized-database: CONTAINER_PORTS=-p 5432:5432 --network="host"
+--containerized-database: CONTAINER_PORTS=-p 127.0.0.1:5432:5432/tcp
 --containerized-database: --image-build
 	if [ "$(IN_CONTAINER)" == "false" ] ; then \
 	  $(CONTAINER_COMMAND) run -it $(CONTAINER_PORTS) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') fradrive/$(FRADRIVE_SERVICE) ; \
@@ -222,7 +227,7 @@ database-%:
 .PHONY: --containerized-%-backend
 --containerized-%-backend: FRADRIVE_SERVICE=backend
 #--containerized-%-backend: --image-build --image-run-%-backend;
---containerized-%-backend: CONTAINER_PORTS=-p $(DEV_PORT_HTTP):3000 -p $(DEV_PORT_HTTPS):3443 --network="host"
+--containerized-%-backend: CONTAINER_PORTS=-p 127.0.0.1:$(DEV_PORT_HTTP):3000/tcp -p 127.0.0.1:$(DEV_PORT_HTTPS):3443/tcp
 --containerized-%-backend: --image-build
 	$(MAKE) -- --image-run-$*-backend