diff --git a/.github/labeler.yml b/.github/labeler.yml
index 83e4a7863..a3a90c456 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,20 +1,59 @@
 ---
-github/action:
+kind/action:
   - changed-files:
       - any-glob-to-any-file: ".github/**/*.yml"
 
+kind/docker:
+  - changed-files:
+      - any-glob-to-any-file: "**/Dockerfile*"
+      - any-glob-to-any-file: "**/.dockerignore"
+
+kind/deps:
+  - changed-files:
+      - any-glob-to-any-file: "**/go.mod"
+      - any-glob-to-any-file: "**/go.sum"
+      - any-glob-to-any-file: "**/package.json"
+      - any-glob-to-any-file: "**/bun.lock"
+
 kind/docs:
   - changed-files:
+      - any-glob-to-any-file: "README.md"
       - any-glob-to-any-file: "docs/**"
 
 kind/go:
   - changed-files:
       - any-glob-to-any-file: "**/*.go"
 
+kind/just:
+  - changed-files:
+      - any-glob-to-any-file: "**/justfile"
+      - any-glob-to-any-file: "**/*.just"
+
+kind/policy:
+  - changed-files:
+      - any-glob-to-any-file: "AI_POLICY.md"
+      - any-glob-to-any-file: "CODE_OF_CONDUCT.md"
+      - any-glob-to-any-file: "LICENSE"
+
+kind/toolchain:
+  - changed-files:
+      - any-glob-to-any-file: ".mise.toml"
+      - any-glob-to-any-file: ".golangci.yml"
+      - any-glob-to-any-file: ".goreleaser.yaml"
+      - any-glob-to-any-file: "codecov.yml"
+      - any-glob-to-any-file: ".github/codecov.yml"
+      - any-glob-to-any-file: ".coverignore"
+      - any-glob-to-any-file: ".github/dependabot.yml"
+
+kind/ts:
+  - changed-files:
+      - any-glob-to-any-file: "**/*.ts"
+      - any-glob-to-any-file: "**/*.tsx"
+
 kind/yaml:
   - changed-files:
-      - any-glob-to-any-file: "**/*.yaml"
-      - any-glob-to-any-file: "**/*.yml"
+      - any-glob-to-any-file: ["**/*.yaml", "**/*.yml"]
+        all-globs-to-all-files: "!.github/**"
 
 test/unit:
   - changed-files: