diff --git a/.github/labeler.yml b/.github/labeler.yml
index 4b4fc91e39..ee6c7d6ae8 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,13 +1,14 @@
 kind/docs:
   - "**/*.md"
-  - "docs/**/*"
+  - "docs/**"
 
 kind/ui:
   - "web_src/**/*"
-  - all: ["templates/**/*", "!templates/swagger/v1_json.tmpl"]
+  - all: ["templates/**", "!templates/swagger/v1_json.tmpl"]
 
 kind/api:
   - "templates/swagger/v1_json.tmpl"
+  - "routers/api/**"
 
 kind/build:
   - "Makefile"
@@ -16,6 +17,12 @@ kind/build:
   - "docker/**"
   - "webpack.config.js"
 
+theme/package-registry:
+  - "modules/packages/**"
+
+kind/cli:
+  - "cmd/**"
+
 kind/lint:
   - ".eslintrc.yaml"
   - ".golangci.yml"