diff --git a/Makefile b/Makefile
index 553ce87..7aa9c99 100644
--- a/Makefile
+++ b/Makefile
@@ -53,8 +53,8 @@ install:  ## install everware
 
 	if [ ! -f env.sh ] ; then cp env.sh.orig env.sh ; fi
 
-ogs: ${LOG} ## watch log file
-	tail -f ${LOG}
+docker-build: ## build docker image
+	docker build --no-cache -t everware/everware:0.10.0 .
 
 test: ## run all tests
 	export UPLOADDIR=${UPLOADDIR}; \
diff --git a/run.makefile b/run.makefile
index 06bf43b..229fca3 100644
--- a/run.makefile
+++ b/run.makefile
@@ -21,9 +21,10 @@ run-dockermachine: clean  ## run everware server on MacOS
 		${EXECUTOR} -f etc/local_dockermachine_config.py --no-ssl 2>&1 | tee ${LOG}
 
 run-daemon: clean ## run everware in daemon mode, linux only, SSL required
+	[ -f ${LOG} ] && mv ${LOG} ${LOG}.`date +%Y%m%d-%s`
 	source ./env.sh && \
-		${EXECUTOR} -f etc/local_config.py >> ${LOG}  2>&1 &
-	pgrep ${EXECUTOR} > ${PIDFILE} || ( tail ${LOG} && exit 1 )
+		${EXECUTOR} -f etc/local_config.py --debug --no-ssl >> ${LOG}  2>&1 &
+	pgrep ${EXECUTOR} > ${PIDFILE} || ( tail ${LOG} && rm ${PIDFILE} && exit 1 )
 	echo "Started. Log saved to ${LOG}"
 
 stop: