diff --git a/.github/labeler.yml b/.github/labeler.yml
index bba82b6cb..986e02b91 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -8,11 +8,18 @@ agent:
 plugin:
   - "apm-sniffer/apm-sdk-plugin/**"
   - "apm-sniffer/optional-plugins/**"
+  - "oap-server/server-cluster-plugin/**"
+  - "oap-server/configuration/**"
+  - "oap-server/storage-plugin/**"
+  - "oap-server/telemetry/**"
+  - "oap-server/receiver-plugin/**"
 
 core feature:
   - "apm-sniffer/apm-agent-core/**"
   - "oap-server/server-core/**"
   - "oap-server/server-library/**"
+  - "oap-server/oal-grammar/**"
+  - "oap-server/oal-rt/**"
 
 docker:
   - "docker/**"
@@ -21,7 +28,18 @@ OAP-backend:
   - "oap-server/**"
 
 UI:
+  - "oap-server/server-query-plugin/**"
   - "skywalking-ui/**"
 
+submodule update:
+  - ".gitmodules"
+
+CI settings:
+  - "appveyor.yml"
+  - "Jenkinsfile"
+  - "Jenkinsfile-E2E"
+  - ".github/**"
+  - "tools/**"
+
 test:
   - "test/**"
\ No newline at end of file
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index d8351c012..38d2043c8 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -5,6 +5,9 @@ jobs:
   label:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v1
+        with:
+          submodules: recursive
       - uses: actions/labeler@v2
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"