diff --git a/Test/E2E/suite/report_build.py b/Test/E2E/suite/report_build.py
index 331aeb3..5843354 100644
--- a/Test/E2E/suite/report_build.py
+++ b/Test/E2E/suite/report_build.py
@@ -74,6 +74,8 @@ def build_e2e(results, work):
     scen = []
     corrs, rss_vals, cpu_vals, tput_vals = [], [], [], []
     for r in results.get("scenarios", []):
+        if r.get("kind", "chain") != "chain":
+            continue
         sid = r["id"]
         metrics = r.get("metrics", {})
         sigs = []
diff --git a/Test/E2E/suite/run_e2e.sh b/Test/E2E/suite/run_e2e.sh
index dea5a45..06dbc84 100755
--- a/Test/E2E/suite/run_e2e.sh
+++ b/Test/E2E/suite/run_e2e.sh
@@ -452,14 +452,20 @@ if [ "${CPP_COV}" -eq 1 ]; then
     # only hit via the direct/recorder/debug E2E flows). Re-running the full
     # scenario matrix here — against the SAME instrumented binaries, before
     # collect.py's lcov capture — lets those .gcda files accumulate E2E-path
-    # coverage too. Run in a subshell with OUT_DIR overridden so the coverage
-    # pass's logs/results land in a discardable subdirectory and none of its
-    # SCEN_IDS/OUT_DIR/trap state leaks back into this shell (the authoritative
-    # results.json was already written above, from the primary pass).
+    # coverage too. Run in a subshell with OUT_DIR *and* WORK overridden so the
+    # coverage pass's logs/results/perf-JSON/waveform-PNG scratch files land in
+    # discardable subdirectories and none of its SCEN_IDS/OUT_DIR/WORK/trap
+    # state leaks back into this shell (the authoritative results.json was
+    # already written above, from the primary pass). WORK must be isolated too,
+    # not just OUT_DIR: run_scenario_matrix writes perf_*/wave_*.png/metrics_*
+    # under WORK, and report_build.py reads those files straight from WORK
+    # after this pass — without isolation the coverage-instrumented re-run
+    # would silently clobber the primary pass's perf/waveform data.
     echo "   re-running scenario matrix under instrumented binaries (coverage pass) ..."
     (
         OUT_DIR="${OUT_DIR}/coverage_pass"
-        mkdir -p "${OUT_DIR}"
+        WORK="${WORK}/coverage_pass"
+        mkdir -p "${OUT_DIR}" "${WORK}"
         run_scenario_matrix "coverage"
     ) || true