diff --git a/.github/ISSUE_TEMPLATE/0-bug-report-template.yml b/.github/ISSUE_TEMPLATE/0-bug-report-template.yml
index 4c45fda0a0..9bfb1c4192 100644
--- a/.github/ISSUE_TEMPLATE/0-bug-report-template.yml
+++ b/.github/ISSUE_TEMPLATE/0-bug-report-template.yml
@@ -72,10 +72,11 @@ body:
         - Chatops
         - Mobile App
         - Schedules
-        - Helm
         - API
-        - Terraform/Crossplane
         - Metrics
+        - Terraform/Crossplane
+        - Helm/Kubernetes/Docker
+        - CI/CD
         - Other
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/1-feature-request-template.yml b/.github/ISSUE_TEMPLATE/1-feature-request-template.yml
index 49c06e7045..011a8e4f9a 100644
--- a/.github/ISSUE_TEMPLATE/1-feature-request-template.yml
+++ b/.github/ISSUE_TEMPLATE/1-feature-request-template.yml
@@ -37,10 +37,11 @@ body:
         - Chatops
         - Mobile App
         - Schedules
-        - Helm
         - API
-        - Terraform/Crossplane
         - Metrics
+        - Terraform/Crossplane
+        - Helm/Kubernetes/Docker
+        - CI/CD
         - Other
     validations:
       required: true
diff --git a/.github/workflows/on-issue-creation.yml b/.github/workflows/on-issue-creation.yml
index 475f066e64..23307322e5 100644
--- a/.github/workflows/on-issue-creation.yml
+++ b/.github/workflows/on-issue-creation.yml
@@ -79,11 +79,12 @@ jobs:
             ${{ 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, 'API') && 'part:API' || '' }}
-            ${{ contains(steps.issue-form-values.outputs.issueparser_product_area, 'Terraform/Crossplane') && 'part:Terraform/Crossplane' || '' }}
             ${{ contains(steps.issue-form-values.outputs.issueparser_product_area, 'Metrics') && 'part:metrics/logging' || '' }}
+            ${{ contains(steps.issue-form-values.outputs.issueparser_product_area, 'Terraform/Crossplane') && 'part:Terraform/Crossplane' || '' }}
+            ${{ contains(steps.issue-form-values.outputs.issueparser_product_area, 'Helm/Kubernetes/Docker') && 'part:helm/kubernetes/docker' || '' }}
+            ${{ contains(steps.issue-form-values.outputs.issueparser_product_area, 'CI/CD') && 'part:ci/cd' || '' }}
             ${{ contains(steps.issue-form-values.outputs.issueparser_product_area, 'Other') && 'more info needed' || '' }}
           # yamllint enable rule:line-length