diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 58d01dd4db..06f17bb054 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,6 +1,9 @@
 name: "Run build"
 on:
   pull_request:
+    # Run when the PR is ready and each time a review is re-requested
+    #  (i.e. after feedback has been addressed).
+    types: [review_requested, ready_for_review]
   workflow_dispatch:
     inputs:
       image_formats:
@@ -35,6 +38,8 @@ permissions: {}
 
 jobs:
   packages:
+    # Do not run when still in draft mode but a review was requested anyway
+    if: github.event.pull_request.draft == false
     name: "Build Flatcar packages"
     runs-on:
       - self-hosted