diff --git a/.mergify.yml b/.mergify.yml
index a9ef6b2d5..a8d883115 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,7 +1,13 @@
 queue_rules:
   - name: default
     conditions:
-      - status-success=complete-pr
+      - or:
+        - status-success=complete-pr
+        - and:
+          # For more context, see "L10N - Auto Merge" rule down below
+          - base~=^releases[_/].*
+          - head~=^automation/sync-strings-\d+
+          - status-success=complete-push
 pull_request_rules:
   - name: Resolve conflict
     conditions:
@@ -30,12 +36,17 @@ pull_request_rules:
           - and:
             - author=mozilla-l10n-automation-bot
             - base=main
+            - head=import-l10n
             - status-success=complete-pr
           - and:
             - author=github-actions[bot]
-            - base~=releases[_/].*
-            # Taskcluster doesn't run when PRs are created by github-actions[bot]
-            # because it's not considered a collaborator.
+            - base~=^releases[_/].*
+            - head~=^automation/sync-strings-\d+
+            - status-success=complete-push
+            # Taskcluster only runs on git-push events because github-actions[bot] is not considered
+            # a collaborator, so pull request events are triggered. That said, github-actions[bot]
+            # doesn't create the PR on a separate fork (unlike mozilla-l10n-automation-bot). That's
+            # why git-push events are taken into account
     actions:
       review:
         type: APPROVE