diff --git a/client/watch.go b/client/watch.go
index 7a0ab57..cb984b1 100644
--- a/client/watch.go
+++ b/client/watch.go
@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"io"
+	"math"
 	"strings"
 	"time"
 
@@ -31,9 +32,14 @@ var watchCmd = &cobra.Command{
 				return ""
 			}
 
-			// Try to display the first or last 20 items, as long as displaying them doesn't exceed 180 characters
+			// Try to display the first or last 20 items, as long as displaying them doesn't exceed 180 characters...
+			// ... except in verbose mode, where we go a bit crazier.
 			displayItems := 20
 			lineLength := 180
+			if verbose {
+				displayItems = 250
+				lineLength = math.MaxInt32
+			}
 			partial := nbItems > displayItems
 			var nItems []string
 			for displayItems > 0 {
diff --git a/provisioner/internal/docker.go b/provisioner/internal/docker.go
index 8679f12..a074cf8 100644
--- a/provisioner/internal/docker.go
+++ b/provisioner/internal/docker.go
@@ -261,6 +261,7 @@ func RunContainer(
 						),
 						[]string{
 							fmt.Sprintf("ALFRED_TASK=%s", task.Name),
+							fmt.Sprintf("ALFRED_TASK_FQN=%s", task.FQN()),
 							"ALFRED_SHARED=/alfred/shared",
 							"ALFRED_OUTPUT=/alfred/output",
 						}...,