diff --git a/Makefile b/Makefile
index a59b61fdd..a47625478 100644
--- a/Makefile
+++ b/Makefile
@@ -94,14 +94,9 @@ release:
 ############################################
 ##### UNIFIED FRONTEND/BACKEND TARGETS #####
 
-# TODO: rewrite all serve-targets to do the following:
-#   - return immediately
-#   - podman-run with -d (detached mode) and save the container id in a file
-#   - provide commands (make-targets?) to access logs of running containers
-#   - additionally provide targets for termination of running containers
-.PHONY: serve
-# HELP: serve frontend, backend, and database
-serve: serve-database serve-memcached serve-minio serve-frontend serve-backend;
+.PHONY: start
+# HELP: start database services, frontend and backend
+start: new-develop start-database start-memcached start-minio start-frontend start-backend;
 
 .PHONY: compile
 # HELP: compile frontend and backend
@@ -359,8 +354,6 @@ develop/.current:
 	$(SET_DEVELOP)
 	echo "$(DEVELOP)" > develop/.current
 
-start: develop start-database start-memcached start-minio start-frontend start-backend;
-
 start-database:  BASE_PORTS = "PGPORT=5432"
 start-database:  SINGLETON = true
 
@@ -375,7 +368,7 @@ start-backend:   SINGLETON = false
 start-backend:   static
 
 start-hoogle:    BASE_PORTS = "HOOGLE_PORT=8081"
-start-hoogle:    SINGLETON=true
+start-hoogle:    SINGLETON = true
 
 start-frontend:  SINGLETON = false
 start-frontend:  WATCH = false