diff --git a/offsite-power-check.sh b/offsite-power-check.sh
index d248f37c..c56bf1e7 100755
--- a/offsite-power-check.sh
+++ b/offsite-power-check.sh
@@ -3,12 +3,9 @@
 PW_FOLDER='/opt/idssys/powerwall'
 PW_LOGFOLDER=${PW_FOLDER}/logs
 PW_LOGARCHIVE=${PW_FOLDER}/logs/archive
-PW_TMPFOLDER=${PW_FOLDER}/.tmp
-[ ! -d ${PW_LOGFOLDER} ] && mkdir ${PW_LOGFOLDER}
-[ ! -d ${PW_LOGARCHIVE} ] && mkdir ${PW_LOGARCHIVE}
-[ ! -d ${PW_TMPFOLDER} ] && mkdir ${PW_TMPFOLDER}
 PW_LOGFILE=${PW_LOGFOLDER}/logfile
 PW_LOGPOWER=${PW_LOGFOLDER}/log-power
+PW_TMPFOLDER=${PW_FOLDER}/.tmp
 [ ! -f ${PW_LOGFILE} ] && touch ${PW_LOGFILE}
 [ ! -f ${PW_LOGPOWER} ] && touch ${PW_LOGPOWER}
 
@@ -137,6 +134,7 @@ PWO_RESTART() {
 }
 
 LOGROTATE(){
+	STOPALL_SERVICES
 	lm=`expr $(date +'%m') - 1`
 	if [ ${lm} = 0 ]; then
 		lm=12
@@ -147,9 +145,12 @@ LOGROTATE(){
 	[ ${lm} -lt 10 ] && lm="0${lm}"
 	ARCHIVEFOLDER=${PW_LOGARCHIVE}/${ly}-${lm}
 	mkdir -p ${ARCHIVEFOLDER}
+	sleep 5s
 	mv ${PW_LOGFOLDER}/log* ${ARCHIVEFOLDER}/ 2> /dev/null
+	mv ${PW_LOGFOLDER}/service.* ${ARCHIVEFOLDER}/ 2> /dev/null
 	[ ! -f ${PW_LOGFILE} ] && touch ${PW_LOGFILE}
 	[ ! -f ${PW_LOGPOWER} ] && touch ${PW_LOGPOWER}
+	STARTALL_SERVICES
 	backupstokeep=(`ls -d ${PW_LOGARCHIVE}/* 2> /dev/null | sort | tail -12`)
 	for folder in $(ls -d ${PW_LOGARCHIVE}/* | sort -r); do
 		keep=0