diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 065d8cfdb9..9512859b74 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,8 +1,6 @@
 ---
 name: Bug Report
 description: Create a report to help us improve
-labels:
-  - bug
 body:
   - type: markdown
     attributes:
@@ -39,6 +37,15 @@ body:
     validations:
       required: true
 
+  - type: checkboxes
+    id: components
+    attributes:
+      label: Select the relevant components
+      options:
+        - label: UI
+        - label: API
+        - label: Docs
+
   - type: dropdown
     id: awx-install-method
     attributes:
diff --git a/.github/issue_labeler.yml b/.github/issue_labeler.yml
index 0821bc8fee..14286c88ad 100644
--- a/.github/issue_labeler.yml
+++ b/.github/issue_labeler.yml
@@ -1,2 +1,12 @@
 needs_triage:
   - '.*'
+"type:bug":
+  - "Please confirm the following"
+"type:enhancement":
+  - "Feature Idea"
+"component:ui":
+  - "\\[X\\] UI"
+"component:api":
+  - "\\[X\\] API"
+"component:docs":
+  - "\\[X\\] Docs"
diff --git a/.github/pr_labeler.yml b/.github/pr_labeler.yml
new file mode 100644
index 0000000000..793e389ac7
--- /dev/null
+++ b/.github/pr_labeler.yml
@@ -0,0 +1,14 @@
+"component:api":
+  - any: ['awx/**/*', '!awx/ui/*']
+
+"component:ui":
+  - any: ['awx/ui/**/*']
+
+"component:docs":
+  - any: ['docs/**/*']
+
+"component:cli":
+  - any: ['awxkit/**/*']
+
+"component:collection":
+  - any: ['awx_collection/**/*']
diff --git a/.github/workflows/triage_new.yml b/.github/workflows/label_issue.yml
similarity index 77%
rename from .github/workflows/triage_new.yml
rename to .github/workflows/label_issue.yml
index f032d1930a..a6cf0db2ca 100644
--- a/.github/workflows/triage_new.yml
+++ b/.github/workflows/label_issue.yml
@@ -1,21 +1,22 @@
-name: Triage
+name: Label Issue
 
 on:
   issues:
     types:
       - opened
+      - reopened
+      - edited
 
 jobs:
   triage:
     runs-on: ubuntu-latest
-    name: Label
+    name: Label Issue
 
     steps:
-      - name: Label issues
+      - name: Label Issue
         uses: github/issue-labeler@v2.4.1
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           not-before: 2021-12-07T07:00:00Z
           configuration-path: .github/issue_labeler.yml
           enable-versioned-regex: 0
-        if: github.event_name == 'issues'
diff --git a/.github/workflows/label_pr.yml b/.github/workflows/label_pr.yml
new file mode 100644
index 0000000000..5f9e25107f
--- /dev/null
+++ b/.github/workflows/label_pr.yml
@@ -0,0 +1,20 @@
+name: Label PR
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+      - synchronize
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    name: Label PR
+
+    steps:
+      - name: Label PR
+        uses: actions/labeler@v3
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          configuration-path: .github/pr_labeler.yml