diff --git a/.github/ISSUE_TEMPLATE/0-bug-report-template.yml b/.github/ISSUE_TEMPLATE/0-bug-report-template.yml
index 329460bc..aab0601a 100644
--- a/.github/ISSUE_TEMPLATE/0-bug-report-template.yml
+++ b/.github/ISSUE_TEMPLATE/0-bug-report-template.yml
@@ -60,7 +60,8 @@ body:
   - type: dropdown
     id: product-area
     attributes:
-      label: Which Grafana OnCall product area(s) best relate to the issue you're facing?
+      label: Product Area
+      description: Which Grafana OnCall product area(s) best relate to the issue you're facing?
       multiple: true
       options:
         - Alert Flow & Configuration
diff --git a/.github/ISSUE_TEMPLATE/1-feature-request-template.yml b/.github/ISSUE_TEMPLATE/1-feature-request-template.yml
index fe9024b2..0618d7cc 100644
--- a/.github/ISSUE_TEMPLATE/1-feature-request-template.yml
+++ b/.github/ISSUE_TEMPLATE/1-feature-request-template.yml
@@ -25,7 +25,8 @@ body:
   - type: dropdown
     id: product-area
     attributes:
-      label: Which Grafana OnCall product area(s) best relate to the feature you're proposing?
+      label: Product Area
+      description: Which Grafana OnCall product area(s) best relate to the issue you're facing?
       multiple: true
       options:
         - Alert Flow & Configuration
diff --git a/.github/workflows/on-issue-creation.yml b/.github/workflows/on-issue-creation.yml
index 779fb2b4..a196eb0f 100644
--- a/.github/workflows/on-issue-creation.yml
+++ b/.github/workflows/on-issue-creation.yml
@@ -57,7 +57,7 @@ jobs:
 
       - name: Map mobile app product area to appropriate assignees
         uses: actions-ecosystem/action-add-assignees@v1
-        if: contains(steps.issue-form-values.outputs.issueparser_product-area, 'Mobile App')
+        if: contains(steps.issue-form-values.outputs.issueparser_product_area, 'Mobile App')
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           assignees: |
@@ -70,11 +70,11 @@ jobs:
         # https://docs.github.com/en/actions/learn-github-actions/expressions#literals:~:text=GitHub%20offers%20ternary%20operator%20like%20behaviour%20that%20you%20can%20use%20in%20expressions
         with:
           labels: |
-            ${{ contains(steps.issue-form-values.outputs.issueparser_product-area, 'Alert Flow & Configuration') && 'part:alert flow & configuration' || '' }}
-            ${{ contains(steps.issue-form-values.outputs.issueparser_product-area, 'Auth') && 'part:auth/teams' || '' }}
-            ${{ contains(steps.issue-form-values.outputs.issueparser_product-area, 'Chatops') && 'part:chatops' || '' }}
-            ${{ contains(steps.issue-form-values.outputs.issueparser_product-area, 'Helm') && 'part:deployment/helm' || '' }}
-            ${{ contains(steps.issue-form-values.outputs.issueparser_product-area, 'Mobile App') && 'part:mobile' || '' }}
-            ${{ contains(steps.issue-form-values.outputs.issueparser_product-area, 'Schedules') && 'part:schedules' || '' }}
-            ${{ contains(steps.issue-form-values.outputs.issueparser_product-area, 'Terraform') && 'part:API/Terraform' || '' }}
-            ${{ contains(steps.issue-form-values.outputs.issueparser_product-area, 'Other') && 'no info or need to discuss' || '' }}
+            ${{ contains(steps.issue-form-values.outputs.issueparser_product_area, 'Alert Flow & Configuration') && 'part:alert flow & configuration' || '' }}
+            ${{ contains(steps.issue-form-values.outputs.issueparser_product_area, 'Auth') && 'part:auth/teams' || '' }}
+            ${{ contains(steps.issue-form-values.outputs.issueparser_product_area, 'Chatops') && 'part:chatops' || '' }}
+            ${{ contains(steps.issue-form-values.outputs.issueparser_product_area, 'Helm') && 'part:deployment/helm' || '' }}
+            ${{ contains(steps.issue-form-values.outputs.issueparser_product_area, 'Mobile App') && 'part:mobile' || '' }}
+            ${{ contains(steps.issue-form-values.outputs.issueparser_product_area, 'Schedules') && 'part:schedules' || '' }}
+            ${{ contains(steps.issue-form-values.outputs.issueparser_product_area, 'Terraform') && 'part:API/Terraform' || '' }}
+            ${{ contains(steps.issue-form-values.outputs.issueparser_product_area, 'Other') && 'no info or need to discuss' || '' }}