diff --git a/.github/ISSUE_TEMPLATE/core-issue.md b/.github/ISSUE_TEMPLATE/core-issue.md
index 2c6b73fb4cd7ebfacf516c1d4b9fcd5395a33ef7..0147c8f338c338cae6bcfc2f83151ebd9a7b3994 100644
--- a/.github/ISSUE_TEMPLATE/core-issue.md
+++ b/.github/ISSUE_TEMPLATE/core-issue.md
@@ -2,7 +2,7 @@
 name: Server Core Issue
 about: Template for creating an issue with bbb-web, akka-apps, or other server component
 title: ''
-labels: Core
+labels: 'module: core'
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 8de1035758957054437afebea1a2426e8d703c67..9c578c2b94f7eb0fd886219225daa0209011fdcb 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: Enhancement
+labels: 'type: enhancement'
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/html5-issue.md b/.github/ISSUE_TEMPLATE/html5-issue.md
index 5bd379cb5957491088653862ecbeebf3bf9b10c9..d8ba48ba898c297409f2d827ec8fdaaeb86bb970 100644
--- a/.github/ISSUE_TEMPLATE/html5-issue.md
+++ b/.github/ISSUE_TEMPLATE/html5-issue.md
@@ -2,7 +2,7 @@
 name: HTML5 Issue
 about: Template for creating HTML5 Issue (frontend which you see during a session, not Greenlight).
 title: ''
-labels: HTML5 Client
+labels: 'module: client'
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/installation-issue.md b/.github/ISSUE_TEMPLATE/installation-issue.md
index ae0e8e1a33a843df02ce9b693b4ccf42cf19cc74..ea2c4f244a68535ee0d5c8ec6ff90ec6da40765f 100644
--- a/.github/ISSUE_TEMPLATE/installation-issue.md
+++ b/.github/ISSUE_TEMPLATE/installation-issue.md
@@ -2,7 +2,7 @@
 name: Installation issue (not a support question)
 about: Template for issues encountered during installation
 title: ''
-labels: Installation
+labels: 'deploy: installation'
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/recording-issue.md b/.github/ISSUE_TEMPLATE/recording-issue.md
index 90f43147d558fd437a89d15c8b2711d9b0a3a09b..167201f8a32bfe4d01414f6500f2043d4332f1bd 100644
--- a/.github/ISSUE_TEMPLATE/recording-issue.md
+++ b/.github/ISSUE_TEMPLATE/recording-issue.md
@@ -2,7 +2,7 @@
 name: Recording Issue
 about: Template for creating a recording issue
 title: ''
-labels: Recording
+labels: 'module: recording'
 assignees: ''
 
 ---
diff --git a/.github/workflows/check-merge-conflict.yml b/.github/workflows/check-merge-conflict.yml
index 09f09c404a6ba5ca985e992ecee04ce41f0f69cc..5e62e8886d028ba9023418d6da8c1ed2118fb5fd 100644
--- a/.github/workflows/check-merge-conflict.yml
+++ b/.github/workflows/check-merge-conflict.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Check for dirty pull requests
         uses: eps1lon/actions-label-merge-conflict@releases/2.x
         with:
-          dirtyLabel: has-conflicts
+          dirtyLabel: "status: conflict"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           commentOnDirty: |
               This pull request has conflicts ☹