diff --git a/.mergify.yml b/.mergify.yml
index cc29eaca1b30..bca110505148 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -9,34 +9,19 @@ queue_rules:
           - check-failure!=Integration tests
       - or:
           - label=bypass:integration
-          - check-success=deployment-test
-          - check-neutral=deployment-test
-          - check-skipped=deployment-test
+          - check-success=deployment-test-result
+          - check-neutral=deployment-test-result
+          - check-skipped=deployment-test-result
       - or:
           - label=bypass:integration
-          - check-failure!=test-docker-build (main)
+          - check-success=test-docker-build-result
+          - check-neutral=test-docker-build-result
+          - check-skipped=test-docker-build-result
       - or:
           - label=bypass:integration
-          - check-skipped=test-docker-build
-          - check-success=test-docker-build (main)
-          - check-neutral=test-docker-build (main)
-          - check-skipped=test-docker-build (main)
-      - or:
-          - label=bypass:integration
-          - check-failure!=getting-started (link-cli)
-      - or:
-          - label=bypass:integration
-          - check-skipped=getting-started
-          - check-success=getting-started (link-cli)
-          - check-neutral=getting-started (link-cli)
-          - check-skipped=getting-started (link-cli)
-      # FIXME: Enable this section to validate NPM deploys...
-      #- or:
-      #    - label=bypass:integration
-      #    - check-skipped=getting-started
-      #    - check-success=getting-started (local-npm)
-      #    - check-neutral=getting-started (local-npm)
-      #    - check-skipped=getting-started (local-npm)
+          - check-success=getting-started-result
+          - check-neutral=getting-started-result
+          - check-skipped=getting-started-result
 
 pull_request_rules:
   - name: merge to master
@@ -44,7 +29,7 @@ pull_request_rules:
       - base=master
       - label=automerge:no-update
       - or:
-          - "#commits-behind=0"
+          - '#commits-behind=0'
           - label=bypass:linear-history
       - or:
           - check-success=wait-integration-pre-checks