diff --git a/.commitlintrc.json b/.commitlintrc.json
index f3f7c591a..105249365 100644
--- a/.commitlintrc.json
+++ b/.commitlintrc.json
@@ -7,18 +7,22 @@
       2,
       "always",
       [
+        "block",
         "bot",
         "build",
-        "ceph",
         "cephfs-mirror",
         "ci",
         "core",
         "csi",
         "docs",
+        "file",
         "helm",
         "mds",
         "mgr",
         "mon",
+        "monitoring",
+        "nfs",
+        "object",
         "osd",
         "pool",
         "rbd-mirror",
diff --git a/.mergify.yml b/.mergify.yml
index 5987b94b6..bde05f5f5 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,14 +1,4 @@
 pull_request_rules:
-  # auto label PRs based on title content
-  - name: auto ceph label pr storage backend
-    conditions:
-      - title~=^ceph
-      - base=master
-    actions:
-      label:
-        add:
-          - ceph
-
   # if there is a conflict in a backport PR, ping the author to send a proper backport PR
   - name: ping author on conflicts
     conditions: