diff --git a/.github/labeler.yml b/.github/labeler.yml
index a1228e2180a..1b91a8d6527 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -20,54 +20,131 @@ module:
           - scripts/**/*
           - temporal/**/*
           - vector/**/*
-vector:
+
+# Module categories
+database:
+  - changed-files:
+      - any-glob-to-any-file:
+          - db/**/*
+          - lib/db/**/*
+          - scripts/db.*/**
+display:
+  - changed-files:
+      - any-glob-to-any-file:
+          - display/**/*
+          - lib/display/**/*
+          - scripts/d.*/**
+general:
+  - changed-files:
+      - any-glob-to-any-file:
+          - general/**/*
+          - scripts/g.*/**
+GUI:
+  - changed-files:
+      - any-glob-to-any-file:
+          - gui/**/*
+imagery:
+  - changed-files:
+      - any-glob-to-any-file:
+          - imagery/**/*
+          - lib/imagery/**/*
+          - scripts/i.*/**
+misc:
   - changed-files:
-      - any-glob-to-any-file: vector/**/*
+      - any-glob-to-any-file:
+          - misc/**/*
+          - scripts/m.*/**
 raster:
   - changed-files:
-      - any-glob-to-any-file: raster/**/*
+      - any-glob-to-any-file:
+          - raster/**/*
+          - lib/raster/**/*
+          - scripts/r.*/**
+raster3d:
+  - changed-files:
+      - any-glob-to-any-file:
+          - raster3d/**/*
+          - lib/raster3d/**/*
+          - scripts/r3.*/**
 temporal:
   - changed-files:
-      - any-glob-to-any-file: temporal/**/*
-database:
+      - any-glob-to-any-file:
+          - temporal/**/*
+          - lib/temporal/**/*
+          - scripts/t.*/**
+vector:
   - changed-files:
-      - any-glob-to-any-file: db/**/*
-GUI:
+      - any-glob-to-any-file:
+          - vector/**/*
+          - lib/vector/**/*
+          - scripts/v.*/**
+
+# Build, packaging, or OS related
+CI:
   - changed-files:
-      - any-glob-to-any-file: gui/**/*
+      - any-glob-to-any-file:
+          - .github/**/*
+          - .travis/**/*
+          - binder/**
+          - .travis.yml
+          - renovate.json
+          - .pre-commit-config.yaml
 Windows:
   - changed-files:
-      - any-glob-to-any-file: mswindows/**/*
+      - any-glob-to-any-file:
+          - mswindows/**/*
 macOS:
   - changed-files:
-      - any-glob-to-any-file: macosx/**/*
+      - any-glob-to-any-file:
+          - macosx/**/*
 Linux:
   - changed-files:
-      - any-glob-to-any-file: singularity/**/*
+      - any-glob-to-any-file:
+          - singularity/**/*
+          - rpm/** 
 docker:
   - changed-files:
-      - any-glob-to-any-file: docker/**/*
+      - any-glob-to-any-file:
+          - docker/**/*
+          - '**/*Dockerfile*'
+          - '**/*dockerfile*'
+          - '*Dockerfile*'
+          - '*dockerfile*'
+          - .dockerignore
+
 docs:
   - changed-files:
       - any-glob-to-any-file:
           - doc/**/*
           - man/**/*
+          - '**/*.md'
+          - '**/*.rst'
+          - '**/*.html'
+          - '**/*.dox'
+          - '**/*.png'
+          - '**.cff'
+          - CITING
+          - CHANGES
+          - AUTHORS
+          - NEWS
+          - TODO
+      - all-globs-to-all-files:
+          - '!doc/development/rfc/*'
 RFC:
   - changed-files:
-      - any-glob-to-any-file: doc/development/rfc/*
+      - any-glob-to-any-file: 
+          - doc/development/rfc/*
 translation:
   - changed-files:
       - any-glob-to-any-file: locale/**/*
-CI:
-  - changed-files:
-      - any-glob-to-any-file:
-          - .github/**/*
-          - .travis/**/*
 
 # based on file types
 Python:
   - changed-files:
-      - any-glob-to-any-file: '**/*.py'
+      - any-glob-to-any-file: 
+        - '**/*.py'
+        - '**/pyproject.toml'
+        - 'pyproject.toml'
 C:
   - changed-files:
       - any-glob-to-any-file: '**/*.c'
@@ -83,6 +160,3 @@ HTML:
 JavaScript:
   - changed-files:
       - any-glob-to-any-file: '**/*.js'
-Markdown:
-  - changed-files:
-      - any-glob-to-any-file: '**/*.md'