diff --git a/lotus-soup/baseline.go b/lotus-soup/baseline.go
index 0ed3e1033..3d1293a7c 100644
--- a/lotus-soup/baseline.go
+++ b/lotus-soup/baseline.go
@@ -115,7 +115,7 @@ func collectAddrs(t *TestEnvironment, ctx context.Context, topic *sync.Topic, ex
 		case a := <-ch:
 			addrs = append(addrs, a)
 		case err := <-sub.Done():
-			return nil, fmt.Errorf("got error while waiting for client addrs: %w", err)
+			return nil, fmt.Errorf("got error while waiting for %v addrs: %w", topic, err)
 		}
 	}
 
diff --git a/lotus-soup/compositions/composition-k8s.toml b/lotus-soup/compositions/composition-k8s.toml
new file mode 100644
index 000000000..c10f65834
--- /dev/null
+++ b/lotus-soup/compositions/composition-k8s.toml
@@ -0,0 +1,64 @@
+[metadata]
+  name = "lotus-soup"
+  author = ""
+
+[global]
+  plan = "lotus-soup"
+  case = "lotus-baseline"
+  total_instances = 3
+  builder = "docker:go"
+  runner = "cluster:k8s"
+
+[global.build_config]
+  push_registry=true
+  go_proxy_mode="remote"
+  go_proxy_url="http://localhost:8081"
+  registry_type="aws"
+
+[[groups]]
+  id = "bootstrapper"
+  [groups.resources]
+    memory = "120Mi"
+    cpu = "10m"
+  [groups.instances]
+    count = 1
+    percentage = 0.0
+  [groups.run]
+    [groups.run.test_params]
+      role = "bootstrapper"
+      clients = "1"
+      miners = "1"
+      balance = "2000"
+      sectors = "10"
+
+[[groups]]
+  id = "miners"
+  [groups.resources]
+    memory = "120Mi"
+    cpu = "10m"
+  [groups.instances]
+    count = 1
+    percentage = 0.0
+  [groups.run]
+    [groups.run.test_params]
+      role = "miner"
+      clients = "1"
+      miners = "1"
+      balance = "2000"
+      sectors = "10"
+
+[[groups]]
+  id = "clients"
+  [groups.resources]
+    memory = "120Mi"
+    cpu = "10m"
+  [groups.instances]
+    count = 1
+    percentage = 0.0
+  [groups.run]
+    [groups.run.test_params]
+      role = "client"
+      clients = "1"
+      miners = "1"
+      balance = "2000"
+      sectors = "10"