diff --git a/.mergify.yml b/.mergify.yml
index 6b3f04ff..aed7233d 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,3 +1,5 @@
+# Inactive until Workflow Automation is enabled for this repository.
+# Keep these conditions aligned with queue_rules.main.queue_conditions.
 pull_request_rules:
   - name: Automatic merge on approval
     conditions:
@@ -9,14 +11,17 @@ pull_request_rules:
         name: main
 queue_rules:
   - name: main
+    # Enforce eligibility even when Workflow Automation is disabled.
+    queue_conditions:
+      - "#approved-reviews-by>=1"
+      - label!=do-not-merge
+      - base=main
     merge_method: squash
-    commit_message_template: |-
-      {{ title }} (#{{ number }})
-
-      {{ body }}
-
-      Approved by: @{{ approved_reviews_by | join(', @') }}
+    commit_message_format:
+      title: pr-title
+      body: pr-body
+      trailers:
+        - approved-by
     checks_timeout: 1 h
-    autoqueue: true
 merge_queue:
   max_parallel_checks: 1