diff --git a/playbooks/nightly-build/post.yaml b/playbooks/nightly-build/post.yaml
index 5cb8988..ae09c36 100644
--- a/playbooks/nightly-build/post.yaml
+++ b/playbooks/nightly-build/post.yaml
@@ -1,4 +1,6 @@
 - name: Get CWS upload/publish log
   hosts: all
   roles:
-    - fetch-cws-log
+    - fetch-cws-upload-log
+  vars:
+    workingDirectory: "{{ zuul.project.src_dir }}/out"
diff --git a/playbooks/nightly-build/pre.yaml b/playbooks/nightly-build/pre.yaml
index c4463a2..45db95f 100644
--- a/playbooks/nightly-build/pre.yaml
+++ b/playbooks/nightly-build/pre.yaml
@@ -2,4 +2,4 @@
   roles:
     - role: ensure-genmanifest
     - role: ensure-cws-upload
-      version: "2.0.1"
+      version: "2.1.0"
diff --git a/playbooks/nightly-build/run.yaml b/playbooks/nightly-build/run.yaml
index a10991c..0d714cd 100644
--- a/playbooks/nightly-build/run.yaml
+++ b/playbooks/nightly-build/run.yaml
@@ -2,5 +2,5 @@
   roles:
     - role: cws-publish
       vars:
-        extension_id: "phefpbdhiknkamngjffpnebaemanmihf"
-        dry_run: false
+        canaryTwptExtensionId: "phefpbdhiknkamngjffpnebaemanmihf"
+        dryRun: false
diff --git a/playbooks/nightly-build/test.yaml b/playbooks/nightly-build/test.yaml
index 73777c0..53d21ec 100644
--- a/playbooks/nightly-build/test.yaml
+++ b/playbooks/nightly-build/test.yaml
@@ -2,5 +2,5 @@
   roles:
     - role: cws-publish
       vars:
-        extension_id: "phefpbdhiknkamngjffpnebaemanmihf"
-        dry_run: true
+        canaryTwptExtensionId: "phefpbdhiknkamngjffpnebaemanmihf"
+        dryRun: true