diff --git a/Makefile b/Makefile
index e23c3fd50..5a4ec4dd8 100644
--- a/Makefile
+++ b/Makefile
@@ -196,9 +196,10 @@ serve-database: --containerized-database
 
 .PHONY: --containerized-database
 --containerized-database: FRADRIVE_SERVICE=database
+--containerized-database: CONTAINER_PORTS=-p 5432:5432
 --containerized-database: --image-build
 	if [ "$(IN_CONTAINER)" == "false" ] ; then \
-	  $(CONTAINER_COMMAND) run fradrive/$(FRADRIVE_SERVICE) ; \
+	  $(CONTAINER_COMMAND) run -it $(CONTAINER_PORTS) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') fradrive/$(FRADRIVE_SERVICE) ; \
 	fi
 
 .PHONY: --containerized-%-frontend
@@ -236,7 +237,7 @@ image-rebuild-%:
 	if [ "$(IN_CONTAINER)" == "true" ] ; then \
 	  $(MAKE) -- $* ; \
 	else \
-	  $(CONTAINER_COMMAND) run $(CONTAINER_INTERACTIVE) -v $(PWD):$${MOUNT_DIR} $(CONTAINER_PORTS) --env IN_CONTAINER=true --env FRADRIVE_MAKE_TARGET=$* fradrive/$(FRADRIVE_SERVICE) ; \
+	  $(CONTAINER_COMMAND) run $(CONTAINER_INTERACTIVE) -v $(PWD):$${MOUNT_DIR} $(CONTAINER_PORTS) --env IN_CONTAINER=true --env FRADRIVE_MAKE_TARGET=$* --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') fradrive/$(FRADRIVE_SERVICE) ; \
 	fi
 
 ##### CONTAINER TARGETS #####