diff --git a/Makefile b/Makefile
index 13286eb10..b980da707 100644
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,7 @@ export CONTAINER_FILE
 export CF_PREFIX
 export DEVELOP
 export MOUNT_DIR=/mnt/fradrive
-# CONTAINER_RUNMODE variants:
-#   detached: detached container
-#   attached: attached container
-export CONTAINER_RUNMODE ?= detached
+export CONTAINER_ATTACHED
 
 export SERVICE
 export SERVICE_VARIANT ?= $(SERVICE)
@@ -111,7 +108,7 @@ start: start-postgres start-memcached start-minio start-frontend start-backend;
 
 .PHONY: %-frontend
 %-frontend: SERVICE=frontend
-%-backend: SERVICE_VARIANT=frontend
+%-frontend: SERVICE_VARIANT=frontend
 %-frontend: CONTAINER_CMD=localhost/fradrive/frontend
 
 .PHONY: %-postgres
@@ -131,43 +128,44 @@ start: start-postgres start-memcached start-minio start-frontend start-backend;
 
 .PHONY: start-%
 start-%: JOB=start
-start-%: CF_PREFIX = "start-"
+start-%: CF_PREFIX = start-
+start-%: CONTAINER_ATTACHED = false
 start-%: --act ;
 
 .PHONY: compile-%
 compile-%: JOB=compile
-compile-%: CF_PREFIX = "compile-"
-compile-%: CONTAINER_RUNMODE = "attached"
+compile-%: CF_PREFIX = compile-
+compile-%: CONTAINER_ATTACHED = true
 compile-%: --act ;
 
 .PHONY: test-%
 test-%: JOB=test
-test-%: CF_PREFIX = "test-"
-test-%: CONTAINER_RUNMODE = "attached"
+test-%: CF_PREFIX = test-
+test-%: CONTAINER_ATTACHED = true
 test-%: --act ;
 
 .PHONY: lint-%
 lint-%: JOB=lint
-lint-%: CF_PREFIX = "lint-"
-lint-%: CONTAINER_RUNMODE = "attached"
+lint-%: CF_PREFIX = lint-
+lint-%: CONTAINER_ATTACHED = true
 lint-%: --act ;
 
 --act: --develop_containerized;
 
 --develop_%: PORTS = $(foreach PORT,$(BASE_PORTS),$(shell utils/next_free_port.pl $(PORT)))
 --develop_%: --ensure-develop
-	$(SET_DEVELOP)
+	DEVELOP=develop/`cat develop/.current` ; \
 	echo "$(SERVICE_PARALLEL)" ; \
 	if [[ "$(SERVICE_PARALLEL)" == "false" ]] ; then \
-	  CONTAINER_FILE=$(DEVELOP)/$(CF_PREFIX)$(SERVICE_VARIANT) ; \
+	  CONTAINER_FILE=$${DEVELOP}/$(CF_PREFIX)$(SERVICE_VARIANT) ; \
 	  JOB_ID=$(JOB) ; \
 	  if [[ -e $${CONTAINER_FILE} ]]; then \
 	    >&2 echo "Another $* service is already running! Use \"make new-develop\" to start a new develop instance despite currently running services." ; \
 	    exit 1 ; \
 	  fi ; \
 	else \
-	  DEVDIR=$(DEVELOP)/$(SERVICE_VARIANT) ; \
-	  I=`ls $(DEVELOP) | grep '$(SERVICE_VARIANT)' | sed 's/$(SERVICE_VARIANT)-//' | sort -n | tail -n1` ; \
+	  DEVDIR=$${DEVELOP}/$(SERVICE_VARIANT) ; \
+	  I=`ls $${DEVELOP} | grep '$(SERVICE_VARIANT)' | sed 's/$(SERVICE_VARIANT)-//' | sort -n | tail -n1` ; \
 	  echo "$${I}" ; \
 	  J=$$(($${I}+1)) ; \
 	  CONTAINER_FILE=$${DEVDIR}-$${J} ; \
@@ -197,6 +195,7 @@ else
 endif
 
 --containerized: --image-build
+	DEVELOP=`cat develop/.current` ; \
 	./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" & \
 	CONTAINER_NAME=fradrive.$(CURR_DEV).$(SERVICE_VARIANT).$(JOB_ID) ; \
 	CONTAINER_ID=`$(CONTAINER_BGRUN) \
@@ -209,7 +208,7 @@ endif
 	  $(CONTAINER_CMD) \
 	` ; \
 	printf "CONTAINER_ID=$${CONTAINER_ID}" >> "$(CONTAINER_FILE)" ; \
-	if [[ "attached" -eq $(CONTAINER_RUNMODE) ]] ; then \
+	if [[ "true" -eq "$(CONTAINER_ATTACHED)" ]] ; then \
 	  $(CONTAINER_COMMAND) attach $${CONTAINER_ID} || : ; \
 	fi