diff --git a/.github/mergify.yml b/.github/mergify.yml
index 28f5cf5c68..54f28609be 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -167,12 +167,15 @@ pull_request_rules:
       - and:
           - -body~=\#[0-9]{1,6}(\s+|$)
           - -body~=https://github.com/milvus-io/milvus/issues/[0-9]{1,6}(\s+|$)
-      - and:
-        - label=kind/enhancement
-        - or:
-          - label=size/L
-          - label=size/XL
-          - label=size/XXL
+      - or:
+        - and:
+          - label=kind/enhancement
+          - or:
+            - label=size/L
+            - label=size/XL
+            - label=size/XXL
+        - label=kind/bug
+        - label=kind/feature
           
       - -label=kind/doc
       - -label=kind/test
@@ -187,25 +190,14 @@ pull_request_rules:
 
   - name: Dismiss block label if related issue be added into PR
     conditions:
-      - or:
-          - and:
-              - or:
-                  - base=master
-                  - base=sql_beta
-                  - base~=^2(\.\d+){1,2}$
-              - or:
-                  - body~=\#[0-9]{1,6}(\s+|$)
-                  - body~=https://github.com/milvus-io/milvus/issues/[0-9]{1,6}(\s+|$)
-          - and:
-              - or:
-                  - base=master
-                  - base=sql_beta
-                  - base~=^2(\.\d+){1,2}$
-              - and:
-                - label=kind/enhancement
-                - -label=size/L
-                - -label=size/XL
-                - -label=size/XXL
+      - and:
+          - or:
+              - base=master
+              - base=sql_beta
+              - base~=^2(\.\d+){1,2}$
+          - or:
+              - body~=\#[0-9]{1,6}(\s+|$)
+              - body~=https://github.com/milvus-io/milvus/issues/[0-9]{1,6}(\s+|$)
     actions:
       label:
         remove: