diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a99ed643345d60497a5e6d78728a48b5f28cc6ae..8e40370fc857ed206b24232f4730de7defe0b665 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -136,6 +136,9 @@ default:
     # Extra error checking
     - set -euo pipefail
 
+    # Dump PL_* vars to stdout
+    - env | grep ^PL_ | sort
+
     # Un-export built-in env vars. Some of these have surprisingly
     # powerful secrets.  Unexporting leaves them set in the shell, but doesn't
     # implicitly pass them to every spawned process. For a process that needs them, pass explicitly:
@@ -467,6 +470,7 @@ tornettools-stage:
       - $SIMDIR/mappings.txt
       - $SIMDIR/tor-err.txt
       - $SIMDIR/tor-warn.txt
+      - $SIMDIR/tornettools.generate*.log
       # Full data for a few clients
       - $SIMDIR/shadow.data/hosts/markovclient[0-3]
       # Full data for a few servers