diff --git a/.github/assign-by-files.yml b/.github/assign-by-files.yml
index 36950b02fa9db..3314d000052ac 100644
--- a/.github/assign-by-files.yml
+++ b/.github/assign-by-files.yml
@@ -1,38 +1,111 @@
 ---
+# Changing all md files should request a language review in case of format failures.
+# TomShawn is the repo administrator.
+
 # you can use glob pattern
 
 # You can set multiple reviewers
-# '.github/':
-#   - yikeke
-#   - ran-huang
+'.github/**/*.yml':
+  - yikeke
+  - ran-huang
 
-# 'tiflash/':
-#   - zanmato1984
+# 'benchmark/**/*.md':
+#   - jackysp
 #   - kissmydb
-#   - yikeke
+#   - TomShawn
 
-# 'tiup/':
-#   - lonng
-#   - lucklove
-#   - kissmydb
-#   - yikeke
+'best-practices/**/*.md':
+  - kissmydb
+  - lilin90
+  - TomShawn
+
+'br/**/*.md':
+  - kissmydb
+  - WangXiangUSTC
+  - TomShawn
 
-# 'sql-statements/':
-#   - bb7133
+'config-templates/**/*.yaml':
+  - kissmydb
+  - superlzs0476
+  - TomShawn
 
-# 'releases/':
-#   - scsldb
+'dashboard/**/*.md':
+  - breeswish
+  - hundundm
+  - kissmydb
+  - TomShawn
 
-# 'dashboard/':
-#   - breeswish
+'faq/**/*.md':
+  - kissmydb
+  - TomShawn
 
-# 'config-templates/':
+# 'functions-and-operators/**/*.md':
 #   - kissmydb
+#   - TomShawn
 
-# 'ticdc/':
-#   - WangXiangUSTC
+# 'media/**/*':
+#   - TomShawn
+#   - lilin90
 
-# Changing all md files should request a language review in case of format failures.
-# TomShawn is the repo administrator.
-'*.*':
+'releases/**/*.md':
+  - scsldb
+  - uglyengineer
+  - TomShawn
+
+'resources/**/*':
+  - yikeke
+  - lilin90
+
+'scripts/**/*':
+  - yikeke
+  - lilin90
+
+'sql-statements/**/*.md':
+  - bb7133
+  - zimulala
+  - TomShawn
+
+# 'storage-engine/**/*.md':
+#   - TomShawn
+#   - 
+
+# 'sync-diff-inspector/**/*.md':
+#   - TomShawn
+#   - 
+
+# 'system-tables/**/*.md':
+#   - TomShawn
+#   - 
+
+'ticdc/**/*.md':
+  - WangXiangUSTC
+  - 3pointer
+  - kissmydb
+  - TomShawn
+
+'tidb-binlog/**/*.md':
+  - july2993
+  - kissmydb
+  - TomShawn
+
+'tidb-lightning/**/*.md':
+  - WangXiangUSTC
+  - kissmydb
+  - TomShawn
+
+'tiflash/**/*.md':
+  - ilovesoup
+  - zanmato1984
+  - kissmydb
+  - yikeke
+
+'tiup/**/*.md':
+  - lonng
+  - lucklove
+  - kissmydb
   - yikeke
+
+# All other file pattern will match the following:
+
+'**/*':
+  - TomShawn
diff --git a/.github/workflows/auto-assign.yml b/.github/workflows/auto-assign.yml
index e5a730c580faa..17c24bbf30c21 100644
--- a/.github/workflows/auto-assign.yml
+++ b/.github/workflows/auto-assign.yml
@@ -9,7 +9,7 @@ jobs:
   assign_reviewer:
     runs-on: ubuntu-latest
     steps:
-    - uses: shufo/auto-assign-reviewer-by-files@v1.0.0
+    - uses: shufo/auto-assign-reviewer-by-files@v1.1.1
       with:
         config: '.github/assign-by-files.yml'
         token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file