diff --git a/Makefile b/Makefile
index 7eef0dcaa..e6aff931b 100644
--- a/Makefile
+++ b/Makefile
@@ -252,7 +252,7 @@ db: --image-build --containerized---db;
 	MINIO_DIR=`mktemp` ; \
 	./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" "" "rm -rf $${MINIO_DIR}" & \
 	CONTAINER_ID=`$(CONTAINER_BGRUN) --name fradrive.minio.$$(date +'%Y-%m-%dT%H-%M-%S') $(MINIO_IMAGE) -- server $${MINIO_DIR} --address=:$${MINIO_PORT}` ; \
-	echo "CONTAINER_ID=$${CONTAINER_ID}\nMINIO_PORT=$${MINIO_PORT}\nMINIO_DIR=$${MINIO_DIR}" >> $(CONTAINER_FILE)
+	printf "CONTAINER_ID=$${CONTAINER_ID}\nUPLOAD_S3_PORT=$${UPLOAD_S3_PORT}\nMINIO_DIR=$${MINIO_DIR}" >> $(CONTAINER_FILE)
 
 # --containerized-%-memcached: FRADRIVE_SERVICE=memcached
 # --containerized-%-memcached: --image-build
@@ -261,7 +261,7 @@ db: --image-build --containerized---db;
 	MEMCACHED_PORT=`cat $(CONTAINER_FILE) | grep 'MEMCACHED_PORT=' | sed 's/MEMCACHED_PORT=//'`; \
 	./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" & \
 	CONTAINER_ID=`$(CONTAINER_BGRUN) $(MEMCACHED_IMAGE) --port=$${MEMCACHED_PORT}` ; \
-	echo "CONTAINER_ID=$${CONTAINER_ID}\nMEMCACHED_PORT=$${MEMCACHED_PORT}" >> $(CONTAINER_FILE)
+	printf "CONTAINER_ID=$${CONTAINER_ID}\nMEMCACHED_PORT=$${MEMCACHED_PORT}" >> $(CONTAINER_FILE)
 
 --containerized-%-database: FRADRIVE_SERVICE=database
 --containerized-%-database: --image-build
diff --git a/utils/watchcontainerrun.sh b/utils/watchcontainerrun.sh
index 67e8ab3a5..6bd720090 100755
--- a/utils/watchcontainerrun.sh
+++ b/utils/watchcontainerrun.sh
@@ -22,6 +22,8 @@ sleep 1 # safety, we do not want to have half written container ids
 
 CONTAINER_ID=`cat $FILENAME | grep 'CONTAINER_ID=' | sed 's/CONTAINER_ID=//'`
 
+if echo "$CONTAINER_ID" | grep '\\n' > /dev/null ; then echo "Bad CONTAINER_ID (contains \\n), please check container file $FILENAME" ; fi
+
 $STARTSCRIPT
 
 while [ -e "$FILENAME" ] ; do