diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 81693c5db..58f8ae2eb 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -1,7 +1,7 @@
 name: Bug Report 🐛
 description: Report something that's not working the intended way. Support requests for external programs (reverse proxies, 3rd party servers, other peoples' forks) will be refused!
 title: '[BUG] <title>'
-labels: ['bug']
+labels: ['🐛 Bug']
 body:
   - type: dropdown
     id: environment
@@ -9,11 +9,11 @@ body:
       label: Environment
       description: Where are you running SillyTavern?
       options:
-        - Self-Hosted (Bare Metal)      
-        - Self-Hosted (Docker)
-        - Android (Termux)
-        - Cloud Service (Static)
-        - Other (Specify below)
+        - 🪟 Windows
+        - 🐧 Linux
+        - 📱 Termux
+        - 🐋 Docker
+        - 🍎 Mac
     validations:
       required: true
 
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
index 9494c7224..4180f93da 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -1,7 +1,7 @@
 name: Feature Request ✨
 description: Suggest an idea for future development of this project
 title: '[FEATURE_REQUEST] <title>'
-labels: ['enhancement']
+labels: ['🦄 Feature Request']
 
 body:
 
diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 000000000..850096c9e
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,18 @@
+# Add/remove 'critical' label if issue contains the words 'urgent' or 'critical'
+#critical:
+#    - '(critical|urgent)'
+
+🪟 Windows:
+    - '(🪟 Windows)'
+
+🍎 Mac:
+    - '(🍎 Mac)'
+
+🐋 Docker:
+    - '(🐋 Docker)'
+
+📱 Termux:
+    - '(📱 Termux)'
+
+🐧 Linux:
+    - '(🐧 Linux)'
\ No newline at end of file
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
new file mode 100644
index 000000000..554c588b8
--- /dev/null
+++ b/.github/workflows/labeler.yml
@@ -0,0 +1,19 @@
+name: "Issue Labeler"
+on:
+  issues:
+    types: [opened, edited]
+
+permissions:
+  issues: write
+  contents: read
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: github/issue-labeler@v3.4
+      with:
+        configuration-path: .github/labeler.yml
+#        not-before: 2020-01-15T02:54:32Z # optional and will result in any issues prior to this timestamp to be ignored.
+        enable-versioned-regex: 0
+        repo-token: ${{ github.token }}
\ No newline at end of file