diff --git a/toci.sh b/toci.sh
index 1dbe874f5..7b426017c 100755
--- a/toci.sh
+++ b/toci.sh
@@ -1,12 +1,14 @@
 #!/usr/bin/env bash
 
+. toci_functions.sh
+
 export STARTTIME=$(date)
 export TOCI_SOURCE_DIR=$PWD
 
 # All temp files should go here
 export TOCI_WORKING_DIR=$(mktemp -d --tmpdir toci_working_XXXXXXX)
 # Any files to be uploaded to results server goes here
-export TOCI_LOG_DIR=$(mktemp -d --tmpdir toci_logs_XXXXXXX)
+export TOCI_LOG_DIR=${TOCI_LOG_DIR:-$(mktemp -d --tmpdir toci_logs_XXXXXXX)}
 # Files that should be cached between runs should go in here
 # e.g. downloaded images, git repo's etc...
 export TOCI_CACHE_DIR=/var/tmp/toci_cache
@@ -24,11 +26,15 @@ export USER=${USER:-$(whoami)}
 mkdir -p $TOCI_CACHE_DIR
 
 STATUS=0
+mark_time Starting setup
 timeout 30m ./toci_setup.sh > $TOCI_LOG_DIR/setup.out 2>&1 || STATUS=1
 if [ $STATUS == 0 ] ; then
+    mark_time Starting tests
     timeout 30m ./toci_test.sh > $TOCI_LOG_DIR/test.out 2>&1 || STATUS=1
 fi
+mark_time Starting cleanup
 timeout 30m ./toci_cleanup.sh > $TOCI_LOG_DIR/cleanup.out 2>&1 || STATUS=1
+mark_time Starting finished
 
 if [ ${TOCI_UPLOAD:-0} == 1 ] ; then
     cd $(dirname $TOCI_LOG_DIR)
diff --git a/toci_functions.sh b/toci_functions.sh
index ebc275d78..741b8c4f0 100644
--- a/toci_functions.sh
+++ b/toci_functions.sh
@@ -39,3 +39,6 @@ apply_patches(){
     done
 }
 
+mark_time(){
+    echo $(date) : $@
+}
diff --git a/updated_launch.sh b/updated_launch.sh
index 048f69584..9c5d001a8 100755
--- a/updated_launch.sh
+++ b/updated_launch.sh
@@ -1,13 +1,18 @@
 #!/usr/bin/env bash
 
+. toci_functions.sh
+
 LOCKFILE=/var/tmp/toci.lock
 GITREF=${1:-origin/master}
 
+export TOCI_LOG_DIR=${TOCI_LOG_DIR:-$(mktemp -d --tmpdir toci_logs_XXXXXXX)}
+RUNLOG=$TOCI_LOG_DIR/run.out
+
 cd $(dirname $0)
-git fetch origin
+git fetch origin | tee -a $RUNLOG 2>&1
 
 # Exit if there is a script already running, otherwise update repo
 # TODO : fix small race condition here (probably not a problem)
-flock -x -n $LOCKFILE git reset --hard $GITREF || exit 0
-flock -x -n $LOCKFILE ./toci.sh
+flock -x -n $LOCKFILE git reset --hard $GITREF | tee -a $RUNLOG 2>&1 || exit 0
+flock -x -n $LOCKFILE ./toci.sh  | tee -a $RUNLOG 2>&1