3 files changed, 71 insertions, 8 deletions
diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
index 10a131c4c..d82d46331 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
@@ -1,4 +1,4 @@
-name: "Bug report: Netdata"
+name: "Netdata Agent: Bug report"
 description: "Submit a report and help us improve our free and open-source Netdata Agent"
 title: "[Bug]: "
 labels: ["bug", "needs triage"]
diff --git a/.github/ISSUE_TEMPLATE/FEAT_REQUEST.yml b/.github/ISSUE_TEMPLATE/FEAT_REQUEST.yml
new file mode 100644
index 000000000..11d77a04a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/FEAT_REQUEST.yml
@@ -0,0 +1,62 @@
+name: "Netdata Agent: Feature request"
+description: "Submit a feature request and help us improve our free and open-source Netdata Agent"
+title: "[Feat]: "
+labels: ["feature request", "needs triage"]
+body:
+  - type: markdown
+    attributes:
+      value: "### Thank you for contributing to our project!"
+  - type: markdown
+    attributes:
+      value: |
+        Submit a feature request and help us improve our free and open-source Netdata Agent.
+  - type: textarea
+    id: problem
+    attributes:
+      label: Problem
+      description: |
+        Is your feature request intended to solve a problem? If so, provide a description of the problem.
+    validations:
+      required: false
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Provide a clear and concise description of the feature you want or need.
+    validations:
+      required: true
+  - type: dropdown
+    id: importance
+    attributes:
+      label: Importance
+      description: |
+        Help us to understand the importance of your feature request. Choose "blocker" if lack of this feature stops you from using Netdata Agent.
+      options:
+        - "nice to have"
+        - "really want"
+        - "must have"
+        - "blocker"
+    validations:
+      required: true
+  - type: textarea
+    id: value-proposition
+    attributes:
+      label: Value proposition
+      description: |
+        Help us to understand why we need this feaure. Describe benefits that users receive if we implement this feature request.
+      value: |
+        1.
+        2.
+        3.
+        ...
+    validations:
+      required: true
+  - type: textarea
+    id: proposed-implementation
+    attributes:
+      label: Proposed implementation
+      description: |
+        Share your proposal if you have any ideas on how this feature can be implemented.
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index e6ea7d316..c21d50e0c 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,14 +1,15 @@
+# Ref: https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
 blank_issues_enabled: false
 contact_links:
-  - name: "Bug report: Netdata Cloud"
+  - name: "Netdata Agent: Question"
+    url: https://github.com/netdata/netdata/discussions/new?category=q-a
+    about: Ask a question about Netdata Agent
+  - name: "Netdata Agent Dashboard"
+    url: https://github.com/netdata/dashboard/issues/new/choose
+    about: Create a report to help us improve our dashboard
+  - name: "Netdata Cloud"
     url: https://github.com/netdata/netdata-cloud/issues/new/choose
     about: Create a report to help us improve our web application
-  - name: Help
-    url: https://community.netdata.cloud/c/support/13
-    about: We offer community-driven support on our community forums
-  - name: Feature request
-    url: https://community.netdata.cloud/c/feature-requests/7
-    about: Make a feature request for Netdata Cloud or the Netdata Agent
   - name: Community
     url: https://netdata.cloud/community
     about: If you don't know where to start, visit our community page!