diff --git a/.github/labeler.yml b/.github/labeler.yml
index de39292c6..94e7e64cf 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,28 +1,15 @@
 needs changelog:
-  - all:
-    - '!docs/changelog.rst'
-    any:
-    - 'include/pybind11/**/*'
-    - 'pybind11/**/*'
-    - 'tools/**/*'
-    - 'CMakeLists.txt'
+- all:
+  - '!docs/changelog.rst'
+  any: 
+  - 'include/pybind11/**/*|pybind11/**/*|tools/**/*|CMakeLists.txt'
 
 docs:
-  - any:
-    - 'docs/basics.rst'
-    - 'docs/benchmark.rst'
-    - 'docs/classes.rst'
-    - 'docs/compiling.rst'
-    - 'docs/faq.rst'
-    - 'docs/index.rst'
-    - 'docs/installing.rst'
-    - 'docs/limitations.rst'
-    - 'docs/reference.rst'
-    - 'docs/release.rst'
-    - 'docs/advanced/**/*.rst'
-    - 'docs/cmake/**/*.rst'
+- any:
+  - 'docs/**/*.rst'
+  - '!docs/changelog.rst'
+  - '!docs/upgrade.rst'
 
 
 ci:
-  - any:
-    - '.github/workflows/*.yaml'
+- '.github/workflows/*.yaml'
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 02ecaf35e..845b1d5d4 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -1,13 +1,11 @@
-name: PR merged
+name: Labeler
 on:
   pull_request_target:
-    types: [opened, reopened, synchronize, edited, closed]
 
 jobs:
   label-merged:
     name: Changelog needed
     runs-on: ubuntu-latest
-    if: "!(github.event.action == 'closed' && github.event.pull_request.merged == false)"
     steps:
     - uses: actions/labeler@main
       with: