diff --git a/.github/labeler.yml b/.github/labeler.yml
index 24ff2f04c6..5782c66c3b 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -15,7 +15,7 @@ btrfs:
     - any-glob-to-any-file: '**/*btrfs*'
 build-system:
   - changed-files:
-    - any-glob-to-any-file: ['meson_options.txt', '**/meson.build', 'Makefile', 'configure']
+    - any-glob-to-any-file: ['meson_options.txt', '**/meson.build']
 busctl:
   - changed-files:
     - any-glob-to-any-file: '**/*busctl*'
@@ -75,10 +75,10 @@ meson:
     - any-glob-to-any-file: ['meson_options.txt', '**/meson.build']
 mkosi:
   - changed-files:
-    - any-glob-to-any-file: ['.mkosi/*', 'mkosi.build']
+    - any-glob-to-any-file: '**/*mkosi*'
 mountfsd:
   - changed-files:
-    - any-glob-to-any-file: ['src/mountfsd/*']
+    - any-glob-to-any-file: 'src/mountfsd/*'
 network:
   - changed-files:
     - any-glob-to-any-file: ['src/libsystemd-network/**/*', 'src/network/**/*']
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index c2d8abd574..2058d22380 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -35,7 +35,7 @@ jobs:
 
     - name: Label PR based on policy in labeler.yml
       uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9
-      if: startsWith(github.event_name, 'pull_request') && github.event.action != 'closed'
+      if: startsWith(github.event_name, 'pull_request') && github.base_ref == 'main' && github.event.action != 'closed'
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
         configuration-path: .github/labeler.yml