diff --git a/.github/ISSUE_TEMPLATE/1_bug_report.yaml b/.github/ISSUE_TEMPLATE/1_bug_report.yaml
index 5bbf27b503..16d59cb6c3 100644
--- a/.github/ISSUE_TEMPLATE/1_bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/1_bug_report.yaml
@@ -29,13 +29,16 @@ body:
     id: versions
     attributes:
       label: What version are you seeing the problem on?
+      id: versions
+      description: select all version where you have experienced this issue
       multiple: true
       options:
-        - 1.6.x
-        - 1.7.x
-        - 1.8.x
-        - 1.9.x
-        - 2.0+
+        - "ver: 1.6.x"
+        - "ver: 1.7.x"
+        - "ver: 1.8.x"
+        - "ver: 1.9.x"
+        - "ver: 2.0.x"
+        - "ver: master"
 
   - type: markdown
     attributes:
diff --git a/.github/workflows/labeler-issue.yml b/.github/workflows/labeler-issue.yml
new file mode 100644
index 0000000000..b28eb987dc
--- /dev/null
+++ b/.github/workflows/labeler-issue.yml
@@ -0,0 +1,35 @@
+name: Label Issue
+on:
+  issues:
+    types: [opened, edited]
+
+permissions:
+  contents: read
+
+jobs:
+  label-component:
+    runs-on: ubuntu-latest
+
+    permissions:
+      # required for all workflows
+      issues: write
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Parse issue form
+        uses: stefanbuck/github-issue-parser@v3
+        id: issue-parser
+        with:
+          template-path: .github/ISSUE_TEMPLATE/1_bug_report.yaml
+
+      - name: Set labels based on severity field
+        uses: redhat-plumbers-in-action/advanced-issue-labeler@v2
+        with:
+          issue-form: ${{ steps.issue-parser.outputs.jsonString }}
+          section: versions
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler-pr.yml
similarity index 76%
rename from .github/workflows/labeler.yml
rename to .github/workflows/labeler-pr.yml
index 11cd619105..e67d7e3e83 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler-pr.yml
@@ -1,6 +1,5 @@
 name: Label Pull Requests
-on:
-  - pull_request_target
+on: [pull_request_target]
 
 jobs:
   triage:
@@ -12,3 +11,4 @@ jobs:
     - uses: actions/labeler@v4
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
+        configuration-path: .github/labeler.yml