diff --git a/src/components/collapse.vue b/src/components/collapse.vue
index 7558393..6a6cece 100644
--- a/src/components/collapse.vue
+++ b/src/components/collapse.vue
@@ -22,6 +22,7 @@
           <Log
             v-bind:runid="runid"
             v-bind:taskid="taskid"
+            v-bind:setup="setup"
             v-bind:step="stepnum"
             v-bind:stepphase="step.phase"
             v-bind:show="active"
@@ -53,6 +54,7 @@ export default {
   props: {
     runid: String,
     taskid: String,
+    setup: Boolean,
     stepnum: Number,
     step: Object
   },
diff --git a/src/components/log.vue b/src/components/log.vue
index 86af32a..915ba37 100644
--- a/src/components/log.vue
+++ b/src/components/log.vue
@@ -18,6 +18,7 @@ export default {
     show: Boolean,
     runid: String,
     taskid: String,
+    setup: Boolean,
     step: Number,
     stepphase: String
   },
@@ -49,17 +50,15 @@ export default {
       }
     },
     streamLogs: function() {
-      this.es = new EventSource(
-        apiurlwithtoken(
-          "/logs?runID=" +
-            this.runid +
-            "&taskID=" +
-            this.taskid +
-            "&step=" +
-            this.step +
-            "&follow"
-        )
-      );
+      let path = "/logs?runID=" + this.runid + "&taskID=" + this.taskid;
+      if (this.setup) {
+        path += "&setup";
+      } else {
+        path += "&step=" + this.step;
+      }
+      path += "&follow&stream";
+
+      this.es = new EventSource(apiurlwithtoken(path));
       this.es.onmessage = event => {
         var data = event.data;
         // TODO(sgotti) ansi_up doesn't handle carriage return (\r), find a way to also handle it
@@ -71,16 +70,13 @@ export default {
       };
     },
     getLogs: function() {
-      fetch(
-        apiurl(
-          "/logs?runID=" +
-            this.runid +
-            "&taskID=" +
-            this.taskid +
-            "&step=" +
-            this.step
-        )
-      )
+      let path = "/logs?runID=" + this.runid + "&taskID=" + this.taskid;
+      if (this.setup) {
+        path += "&setup";
+      } else {
+        path += "&step=" + this.step;
+      }
+      fetch(apiurl(path))
         .then(r => {
           if (r.status == 200) {
             return r.text();
diff --git a/src/components/task.vue b/src/components/task.vue
index 2076c79..518c655 100644
--- a/src/components/task.vue
+++ b/src/components/task.vue
@@ -6,6 +6,12 @@
         <span class="task-name" v-html="task.name"/>
         <span class="tag" :class="taskClass(task)">{{ task.status | capitalize }}</span>
       </div>
+      <Collapse
+        v-bind:runid="runid"
+        v-bind:taskid="taskid"
+        v-bind:setup="true"
+        v-bind:step="task.setup_step"
+      />
       <div v-for="(step, index) in task.steps" v-bind:key="index">
         <Collapse
           v-bind:runid="runid"