diff --git a/.github/labeler.yml b/.github/labeler.yml
index 32936a6180..8aadb051ae 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,24 +1,38 @@
-"Changes: C#":
-  - "**/*.cs"
+"Changes: C#":
+- changed-files:
+  - any-glob-to-any-file: "**/*.cs"
 
 "Changes: Documentation":
+- changed-files:
   - "**/*.xml"
   - "**/*.md"
 
 "Changes: Localization":
-- 'Resources/Locale/**/*.ftl'
+- changed-files:
+  - any-glob-to-any-file:
+    - 'Resources/Locale/**/*.ftl'
 
 "Changes: Map":
-  - "Resources/Maps/**/*.yml"
-  - "Resources/Prototypes/Maps/**/*.yml"
+- changed-files:
+  - any-glob-to-any-file:
+    - "Resources/Maps/**/*.yml"
+    - "Resources/Prototypes/Maps/**/*.yml"
 
 "Changes: Sprite":
-  - "**/*.rsi/*.png"
-  - "**/*.rsi/*.json"
+- changed-files:
+  - any-glob-to-any-file:
+    - "**/*.rsi/*.png"
+    - "**/*.rsi/*.json"
 
 "Changes: UI":
-  - "**/*.xaml*"
+- changed-files:
+  - any-glob-to-any-file:
+    - "**/*.xaml*"
 
 "Changes: YML":
-  - any: ["**/*.yml"]
-    all: ["!Resources/Maps/**/*.yml", "!Resources/Prototypes/Maps/**/*.yml"]
+- changed-files:
+  - any-glob-to-any-file:
+    - "**/*.yml"
+  - all-globs-to-all-files:
+    - "!Resources/Maps/**/*.yml"
+    - "!Resources/Prototypes/Maps/**/*.yml"
diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml
index a47965334c..0e84fa63b2 100644
--- a/.github/workflows/conflict-labeler.yml
+++ b/.github/workflows/conflict-labeler.yml
@@ -1,18 +1,20 @@
 name: Check Merge Conflicts
 
 on:
-  push:
-    branches:
-      - master
   pull_request_target:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
 
 jobs:
   Label:
-    if: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot'
+    if: ( github.event.pull_request.draft == false ) && ( github.actor != 'PJBot' ) && ( github.actor != 'DeltaV-Bot' )
     runs-on: ubuntu-latest
     steps:
       - name: Check for Merge Conflicts
-        uses: ike709/actions-label-merge-conflict@9eefdd17e10566023c46d2dc6dc04fcb8ec76142
+        uses: eps1lon/actions-label-merge-conflict@v3.0.0
         with:
           dirtyLabel: "Status: Merge Conflict"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/labeler-pr.yml b/.github/workflows/labeler-pr.yml
index e1755aa26e..f0f66ea137 100644
--- a/.github/workflows/labeler-pr.yml
+++ b/.github/workflows/labeler-pr.yml
@@ -6,8 +6,9 @@ on:
 jobs:
   labeler:
     if: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot'
+    permissions:
+      contents: read
+      pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v3
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+    - uses: actions/labeler@v5