diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 5db1fbc3..168f8edb 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -11,6 +11,23 @@ body:
   validations:
     required: true
 
+- type: dropdown
+  attributes:
+    label: Related helm chart
+    description: You may select more than one.
+    multiple: true
+    options:
+      - argo-cd
+      - argo-events
+      - argo-rollouts
+      - argo-workflows
+      - argocd-applicationset
+      - argocd-image-updater
+      - argocd-notifications
+      - other
+  validations:
+    required: true
+
 - type: textarea
   attributes:
     label: To Reproduce
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
index 2ff5ab68..2fa38441 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -13,6 +13,23 @@ body:
   validations:
     required: false
 
+- type: dropdown
+  attributes:
+    label: Related helm chart
+    description: You may select more than one.
+    multiple: true
+    options:
+      - argo-cd
+      - argo-events
+      - argo-rollouts
+      - argo-workflows
+      - argocd-applicationset
+      - argocd-image-updater
+      - argocd-notifications
+      - other
+  validations:
+    required: true
+
 - type: textarea
   attributes:
     label: Describe the solution you'd like