diff --git a/.github/ISSUE_TEMPLATE/02-bug-report.yml b/.github/ISSUE_TEMPLATE/02-bug-report.yml
index 258d535deb1..3838b732552 100644
--- a/.github/ISSUE_TEMPLATE/02-bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/02-bug-report.yml
@@ -1,14 +1,13 @@
 name: Bug Report Form
 description: Use this template for reporting an issue, via a form
-labels: Triage
+labels: Triage, UnconfirmedDefect
   # projects: ["NREL/64"]
 body:
   - type: markdown
     attributes:
       value: |
         Thanks for taking the time to submit a report.
-        **Please don't forget to update the issue title.**
-        Include all applicable information to help us reproduce
+        Include all applicable information to help us reproduce.
 
   - type: textarea
     id: description
diff --git a/.github/ISSUE_TEMPLATE/03-enhancement-request.yml b/.github/ISSUE_TEMPLATE/03-enhancement-request.yml
new file mode 100644
index 00000000000..a20aaa3c3a9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/03-enhancement-request.yml
@@ -0,0 +1,38 @@
+name: Enhancement Request
+description: Use this template for suggesting an enhancement.
+labels: Triage, NewFeatureRequest
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to submit a report.
+        Include all applicable information to help us reproduce.
+
+  - type: textarea
+    id: summary
+    attributes:
+      label: General Summary
+      description: |
+        Provide a general summary of the feature you would like to see implemented
+    validations:
+      required: true
+
+  - type: textarea
+    id: details
+    attributes:
+      label: Detailed Description
+      description: |
+        Provide a detailed description of the change or addition you are proposing.
+
+        Include screenshots, schemas, IDD/IDF snippets as appropriate.
+    validations:
+      required: true
+
+  - type: textarea
+    id: implementation
+    attributes:
+      label: Possible Implementation
+      description: |
+        Not mandatory, but if you can, suggest an idea for implementing the feature
+    validations:
+      required: false