diff --git a/.github/workflows/server-mariadb-tests.yml b/.github/workflows/server-mariadb-tests.yml
index 93a9317ad0..075b76e8a1 100644
--- a/.github/workflows/server-mariadb-tests.yml
+++ b/.github/workflows/server-mariadb-tests.yml
@@ -13,7 +13,7 @@ jobs:
       matrix:
        container: [1, 2]
 
-    name: MariaDB Tests
+    name: Python Unit Tests (MariaDB)
 
     services:
       mysql:
diff --git a/.github/workflows/server-postgres-tests.yml b/.github/workflows/server-postgres-tests.yml
index 5d6b4b87dc..4325eebaad 100644
--- a/.github/workflows/server-postgres-tests.yml
+++ b/.github/workflows/server-postgres-tests.yml
@@ -13,7 +13,7 @@ jobs:
       matrix:
        container: [1, 2]
 
-    name: PostgreSQL Tests
+    name: Python Unit Tests (Postgres)
 
     services:
       postgres:
diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
index 5c11674293..9eea128cd1 100644
--- a/.github/workflows/ui-tests.yml
+++ b/.github/workflows/ui-tests.yml
@@ -13,7 +13,7 @@ jobs:
       matrix:
        containers: [1, 2]
 
-    name: Mariadb Tests
+    name: UI Tests (Cypress)
 
     services:
       mysql:
diff --git a/.mergify.yml b/.mergify.yml
index 82f710a5a8..6535c5eb48 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,12 +1,12 @@
 pull_request_rules:
   - name: Automatic merge on CI success and review
     conditions:
-      - status-success=Sider
-      - status-success=Semantic Pull Request
-      - status-success=Python MariaDB
-      - status-success=Python PostgreSQL
-      - status-success=UI MariaDB
-      - status-success=security/snyk (frappe)
+      - check-success=Sider
+      - check-success=Semantic Pull Request
+      - check-success=Python Unit Tests (MariaDB)
+      - check-success=Python Unit Tests (Postgres)
+      - check-success=UI Tests (Cypress)
+      - check-success=security/snyk (frappe)
       - label!=dont-merge
       - label!=squash
       - "#approved-reviews-by>=1"
@@ -15,11 +15,11 @@ pull_request_rules:
         method: merge
   - name: Automatic squash on CI success and review
     conditions:
-      - status-success=Sider
-      - status-success=Python MariaDB
-      - status-success=Python PostgreSQL
-      - status-success=UI MariaDB
-      - status-success=security/snyk (frappe)
+      - check-success=Sider
+      - check-success=Python Unit Tests (MariaDB)
+      - check-success=Python Unit Tests (Postgres)
+      - check-success=UI Tests (Cypress)
+      - check-success=security/snyk (frappe)
       - label!=dont-merge
       - label=squash
       - "#approved-reviews-by>=1"