diff --git a/Makefile b/Makefile
index 985fd51d1..04393d287 100644
--- a/Makefile
+++ b/Makefile
@@ -299,7 +299,11 @@ image-rebuild-%:
 	  $(MAKE) -- $* ; \
 	else \
 	  CONTAINER_ID=`$(CONTAINER_RUN) -v $(PWD):$${MOUNT_DIR} --env IN_CONTAINER=true --env FRADRIVE_MAKE_TARGET=$* --env CONTAINER_FILE=$(CONTAINER_FILE) --env CONTAINER_FILE_CONTENT=$(CONTAINER_FILE_CONTENT) --env WATCH=$(WATCH) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') localhost/fradrive/$(FRADRIVE_SERVICE)` ; \
-	  echo "CONTAINER_ID=$${CONTAINER_ID}" >> $(CONTAINER_FILE); \
+	  if [ -e "$(CONTAINER_FILE)" ] ; then \
+	    echo "CONTAINER_ID=$${CONTAINER_ID}" >> "$(CONTAINER_FILE)"; \
+	  else \
+	    $(CONTAINER_COMMAND) attach $${CONTAINER_ID} ; \
+	  fi \
 	fi
 
 # .PHONY: new-backend