diff --git a/Makefile b/Makefile
index e1e7cb5b3..abbe9a303 100644
--- a/Makefile
+++ b/Makefile
@@ -363,8 +363,8 @@ stop-container-by-id:
 
 .PHONY: log-%
 # HELP(log-{database,memcached,minio,backend,frontend,hoogle}): inspect output of a given (currently running) service. When a service supports multiple running instances in one develop (i.e. backend), you need to specify the exact instance by its associated file (e.g. backend-1, backend-2, etc.), please check the contents of the develop/ directory for a list of running instances.
-log-%:
-	$(CONTAINER_COMMAND) logs --follow --tail=$(LOGSIZE) `cat develop/$(CURRENT_DEVELOP)/$* | grep CONTAINER_ID= | sed 's/^CONTAINER_ID=//'`
+log-%: --develop
+	$(CONTAINER_COMMAND) logs --follow --tail=$(LOGSIZE) `cat $(DEVELOP)/$* | grep CONTAINER_ID= | sed 's/^CONTAINER_ID=//'`
 
 ##### CONTAINER TARGETS #####
 #############################
@@ -374,7 +374,8 @@ log-%:
 
 DATE := $(shell date +'%Y-%m-%dT%H-%M-%S')
 
-SET_DEVELOP = $(eval DEVELOP=develop/`ls -1 develop | tail -n1`)
+CURR_DEV = $(shell ls -1 develop | tail -n1)
+SET_DEVELOP = $(eval DEVELOP=develop/$$(CURR_DEV))
 NEW_DEVELOP = $(eval DEVELOP=develop/$$(DATE))
 
 .PHONY: new-develop