diff --git a/roles/cws-publish/defaults/main.yaml b/roles/cws-publish/defaults/main.yaml
index 4055a80..654e277 100644
--- a/roles/cws-publish/defaults/main.yaml
+++ b/roles/cws-publish/defaults/main.yaml
@@ -1 +1 @@
-dryrun: false
+dryRun: false
diff --git a/roles/cws-publish/tasks/main.yaml b/roles/cws-publish/tasks/main.yaml
index 7968ad4..b93f1cb 100644
--- a/roles/cws-publish/tasks/main.yaml
+++ b/roles/cws-publish/tasks/main.yaml
@@ -1,10 +1,3 @@
-- name: Check extension_id, credentials.clientId, credentials.refreshToken are set
-  when: >
-    extension_id is not defined or credentials.clientId is not defined or
-    credentials.refreshToken is not defined
-  fail:
-    msg: "extension_id, credentials.clientId and credentials.refreshToken must be set"
-
 - name: Build extension
   include_role:
     name: build-extension
@@ -27,31 +20,15 @@
   debug:
     msg: "zip_file.stdout is \"{{ zip_file.stdout }}\""
 
-- name: Upload and publish the ZIP file to the Chrome Web Store
-  when: not (dry_run|bool)
-  ansible.builtin.shell:
-    cmd: |
-      set -o pipefail
-      chrome-webstore-upload upload --auto-publish --extension-id {{ extension_id }} \
-          --trusted-testers --source {{ zip_file.stdout|quote }} \
-          --client-id {{ credentials.clientId|quote }} \
-          --refresh-token {{ credentials.refreshToken|quote }} \
-          2>&1 | tee cws-log.txt
-    chdir: "{{ zuul.project.src_dir }}/out"
-    executable: /bin/bash
-  no_log: True
-  register: uploadcmd
-  failed_when: false
-
-- name: Read upload log
-  when: not (dry_run|bool)
-  ansible.builtin.shell:
-    cmd: cat cws-log.txt
-    chdir: "{{ zuul.project.src_dir }}/out"
-    executable: /bin/bash
-  register: uploadlog
-
-- name: Check whether the upload was successful
-  when: "not (dry_run|bool) and not (uploadcmd.rc == 0 or ('ITEM_NOT_UPDATABLE' in uploadlog.stdout) or ('PKG_INVALID_VERSION_NUMBER') in uploadlog.stdout)"
-  fail:
-    msg: "{{ uploadlog.stdout }}"
+- when: not (dryRun|bool)
+  include_role:
+    name: cws-upload
+  vars:
+    extensionId: "{{ canaryTwptExtensionId }}"
+    clientId: "{{ credentials.clientId }}"
+    clientSecret: "{{ credentials.clientSecret }}"
+    refreshToken: "{{ credentials.refreshToken }}"
+    workingDirectory: "{{ zuul.project.src_dir }}/out"
+    zipFile: "{{ zip_file.stdout|quote }}"
+    autopublish: true
+    trustedTesters: true
diff --git a/roles/fetch-cws-log/tasks/main.yaml b/roles/fetch-cws-log/tasks/main.yaml
deleted file mode 100644
index 3a9d75e..0000000
--- a/roles/fetch-cws-log/tasks/main.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- name: Is there a cws-log.txt
-  register: stat_log
-  stat:
-    path: "{{ zuul.project.src_dir }}/out/cws-log.txt"
-
-- name: Store on executor
-  when: stat_log.stat.exists
-  synchronize:
-    mode: pull
-    src: "{{ zuul.project.src_dir }}/out/cws-log.txt"
-    dest: "{{ zuul.executor.log_root }}/cws-log.txt"
-    verify_host: true
-    owner: no
-    group: no