diff --git a/.copier-answers.ci.yml b/.copier-answers.ci.yml
index 521ee42c..2431559a 100644
--- a/.copier-answers.ci.yml
+++ b/.copier-answers.ci.yml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: v0.9.0-9-g87c309d
+_commit: v0.9.0-14-g907828a
 _src_path: gh:athackst/ci
 automerge_mode: poll
 do_releases: false
diff --git a/.github/workflows/pr_automerge.yml b/.github/workflows/pr_automerge.yml
index 35d4033c..00145a2f 100644
--- a/.github/workflows/pr_automerge.yml
+++ b/.github/workflows/pr_automerge.yml
@@ -8,14 +8,14 @@ on:
     types:
       - labeled
       - unlabeled
+      - ready_for_review
 
 concurrency:
   group: "pr-automerge-${{ github.event.pull_request.number || github.ref }}"
-  cancel-in-progress: false
+  cancel-in-progress: ${{ github.event.action == 'unlabeled' && github.event.label.name == 'automerge' }}
 
 jobs:
   pr-automerge:
-    if: ${{ github.event.pull_request.state == 'open' }}
     permissions:
       contents: write
       pull-requests: write