diff --git a/.backportrc.json b/.backportrc.json
new file mode 100644
index 000000000..73e52819d
--- /dev/null
+++ b/.backportrc.json
@@ -0,0 +1,13 @@
+{
+    "repoName": "diagnostics",
+    "repoOwner": "ros",
+    "sourceBranch": "ros2",
+    "targetBranchChoices": [
+        "ros2-humble",
+        "ros2-jazzy",
+        "ros2-kilted"
+    ],
+    "targetPRLabels": [
+        "automerge"
+    ]
+}
\ No newline at end of file
diff --git a/.github/mergify.yml b/.github/mergify.yml
index a9c6804d3..cf1504bda 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -17,4 +17,26 @@ pull_request_rules:
     actions:
       close: 
         message: Please make all PRs against the `ros2` branch. They will be backported if possible.
-      
\ No newline at end of file
+<<<<<<< HEAD
+      
+=======
+  - name: Automatic merge
+    description: Merge when PR passes all branch protection and has label automerge
+    conditions:
+      - label = automerge
+      # we have to list all checks, apparently
+      - check-success = Check licenses
+      - check-success = Lint cppcheck
+      - check-success = Lint cpplint
+      - check-success = Lint flake8
+      - check-success = Lint uncurstify
+      - check-success = Lint xmllint
+      - check-success = diagnostic_aggregator on rolling
+      - check-success = diagnostic_common_diagnostics on rolling
+      - check-success = diagnostic_remote_logging on rolling
+      # - check-success = diagnostic_topic_monitor on rolling
+      - check-success = diagnostic_updater on rolling
+      - check-success = self_test on rolling
+    actions:
+      merge:
+>>>>>>> 7f36aee (Listing all checks for automerge (#484))