diff --git a/.github/workflows/chipyard-run-tests.yml b/.github/workflows/chipyard-run-tests.yml
index eb976c00..b68f5167 100644
--- a/.github/workflows/chipyard-run-tests.yml
+++ b/.github/workflows/chipyard-run-tests.yml
@@ -33,7 +33,6 @@ jobs:
     runs-on: ubuntu-latest
     # Queried by downstream jobs to determine if they should run.
     outputs:
-      needs-docs:    ${{ steps.filter.outputs.docs }}
       needs-rtl: ${{ steps.filter.outputs.all_count != steps.filter.outputs.skip-rtl_count }}
 
     steps:
@@ -100,7 +99,6 @@ jobs:
   documentation-check:
     name: documentation-check
     needs: change-filters
-    if: needs.change-filters.outputs.needs-docs == 'true'
     runs-on: ubuntu-latest
     container:
       image: ucbbar/chipyard-ci-image:554b436
diff --git a/.mergify.yml b/.mergify.yml
index b386c184..0615acdc 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -10,7 +10,7 @@ pull_request_rules:
     actions:
       backport:
         branches:
-          - 1.13.x
+          - 1.6.x
         ignore_conflicts: True
         label_conflicts: "bp-conflict"
       label: