diff --git a/.github/labeler.yml b/.github/labeler.yml
index c8ebdad6f6..5cd6740d41 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,83 +1,98 @@
 # Add/remove 'critical' label if issue contains the words 'urgent' or 'critical'
 # Type
 "type: game server request":
-    - '(Server Request)'
+    - '/(Server Request)/i'
 "type: bug":
-    - '(bug)'
+    - '/(bug)/i'
 "type: feature request":
-    - '(feature)'
+    - '/(feature)/i'
 # Commands
 "command: backup":
-    - '(backup)'
+    - '/(backup)/i'
 "command: console":
-    - '(console|tmux)'
+    - '/(console|tmux)/i'
 "command: debug":
-    - '(debug)'
+    - '/(debug)/i'
 "command: details":
-    - '(details)'
+    - '/(details)/i'
 "command: fast-dl":
-    - '(fast-dl|fastdl)'
+    - '/(fast-dl|fastdl)/i'
 "command: install":
-    - '(install)'
+    - '/(install)/i'
 "command: mods":
-    - '(mods)'
+    - '/(mods)/i'
 "command: monitor":
-    - '(monitor)'
+    - '/(monitor)/i'
 "command: post-details":
-    - '(post-details)'
+    - '/(post-details)/i'
 "command: restart":
-    - '(restart)'
+    - '/(restart)/i'
 "command: send":
-    - '(send)'
+    - '/(send)/i'
 "command: skeleton":
-    - '(skeleton)'
+    - '/(skeleton)/i'
 "command: start":
-    - '(start)'
+    - '/(start)/i'
 "command: stop":
-    - '(stop)'
+    - '/(stop)/i'
 "command: update-lgsm":
-    - '(update-lgsm)'
+    - '/(update-lgsm)/i'
 "command: update":
-    - '(update)'
+    - '/(update)/i'
 "command: validate":
-    - '(validate)'
+    - '/(validate)/i'
 "command: wipe":
-    - '(wipe)'
+    - '/(wipe)/i'
 # Distros
 "distro: AlmaLinux":
-    - '(Alma)'
+    - '/(Alma)/i'
 "distro: Arch Linux":
-    - '(Arch)'
+    - '/(Arch)/i'
 "distro: CentOS":
-    - '(CentOS)'
+    - '/(CentOS)/i'
 "distro: Debian":
-    - '(Debian)'
+    - '/(Debian)/i'
 "distro: Fedora":
-    - '(Fedora)'
+    - '/(Fedora)/i'
 "distro: openSUSE":
-    - '(openSUSE)'
+    - '/(openSUSE|suse)/i'
 "distro: Rocky Linux":
-    - '(Rocky)'
+    - '/(Rocky)/i'
 "distro: Slackware":
-    - '(Slackware)'
+    - '/(Slackware)/i'
 "distro: Ubuntu":
-    - '(Ubuntu)'
+    - '/(Ubuntu)/i'
 # Info
 "info: alerts":
-    - '(alert)'
+    - '/(alert)/i'
 "info: dependency":
-    - '(dependency|deps)'
+    - '/(dependency|deps)/i'
 "info: docker":
-    - '(docker)'
+    - '/(docker)/i'
 "info: docs":
-    - '(documentation|docs)'
+    - '/(documentation|docs)/i'
 "info: email":
-    - '(postfix|sendmail|exim|smtp)'
+    - '/(postfix|sendmail|exim|smtp)/i'
+"info: query":
+    - '/(gamedig|gsquery)/i'
 "info: steamcmd":
-    - '(steamcmd)'
+    - '/(steamcmd)/i'
 "info: systemd":
-    - '(systemd)'
+    - '/(systemd)/i'
 "info: tmux":
-    - '(tmux)'
+    - '/(tmux)/i'
 "info: website":
-    - '(website)'
+    - '/(website)/i'
+# Games
+"game: Ark: Survival Evolved":
+    - '/(Ark: Survival Evolved|Ark)/i'
+"game: ARMA 3":
+    - '/(ARMA 3)/i'
+"game: Assetto Corsa":
+    - '/(Assetto Corsa)/i'
+"game: Avorion":
+    - '/(Avorion)/i'
+"game: Ballistic Overkill":
+    - '/(Ballistic Overkill)/i'
+"game: Barotrauma":
+    - '/(Barotrauma)/i'
diff --git a/.github/pr-labeler.yml b/.github/pr-labeler.yml
new file mode 100644
index 0000000000..06092ef110
--- /dev/null
+++ b/.github/pr-labeler.yml
@@ -0,0 +1,3 @@
+feature: ['feature/*', 'feat/*']
+hotfix: hotfix/*
+release: release/*
diff --git a/.github/workflows/label-sponsors.yml b/.github/workflows/label-sponsors.yml
index 0b7691cbb8..8cf880da97 100644
--- a/.github/workflows/label-sponsors.yml
+++ b/.github/workflows/label-sponsors.yml
@@ -1,9 +1,9 @@
 name: Label sponsors
 on:
   pull_request:
-    types: [opened, edited]
+    types: [opened]
   issues:
-    types: [opened, edited]
+    types: [opened]
 jobs:
   build:
     name: is-sponsor-label
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 8d806009da..7b8e2668ad 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -7,7 +7,9 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-    - uses: github/issue-labeler@v2.0
+    - uses: github/issue-labeler@v2.4
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
         configuration-path: .github/labeler.yml
+        not-before:
+        enable-versioned-regex: 0
diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
new file mode 100644
index 0000000000..8b73715746
--- /dev/null
+++ b/.github/workflows/pr-labeler.yml
@@ -0,0 +1,14 @@
+name: PR Labeler
+on:
+  pull_request:
+    types: [opened, edited, closed]
+
+jobs:
+  pr-labeler:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: TimonVS/pr-labeler-action@v3
+        with:
+          configuration-path: .github/pr-labeler.yml # optional, .github/pr-labeler.yml is the default value
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}