diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/01-feature.yml
similarity index 92%
rename from .github/ISSUE_TEMPLATE/feature.yml
rename to .github/ISSUE_TEMPLATE/01-feature.yml
index 9f331d37..164acf1b 100644
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/01-feature.yml
@@ -1,6 +1,6 @@
 name: 💡 Feature Request
-description: Create a feature request for this SDK.
-labels: 'enhancement'
+description: Propose new functionality for the SDK
+type: Feature
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/02-improvement.yml b/.github/ISSUE_TEMPLATE/02-improvement.yml
new file mode 100644
index 00000000..ae828cd7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/02-improvement.yml
@@ -0,0 +1,30 @@
+name: 💡 Improvement
+description: Propose an improvement for existing functionality of the SDK
+type: Improvement
+body:
+  - type: markdown
+    attributes:
+      value: Thanks for taking the time to file a request! Please fill out this form as completely as possible.
+  - type: textarea
+    id: problem
+    attributes:
+      label: Problem Statement
+      description: A clear and concise description of what you want and what your use case is.
+      placeholder: |-
+        I want to make whirled peas, but Sentry doesn't blend.
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: Solution Brainstorm
+      description: We know you have bright ideas to share ... share away, friend.
+      placeholder: |-
+        Add a blender to Sentry.
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |-
+        ## Thanks 🙏
+        Check our [triage docs](https://open.sentry.io/triage/) for what to expect next.
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/03-bug.yml
similarity index 99%
rename from .github/ISSUE_TEMPLATE/bug.yml
rename to .github/ISSUE_TEMPLATE/03-bug.yml
index 58fe1edb..6b6c91f5 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/03-bug.yml
@@ -1,5 +1,6 @@
 name: 🐞 Bug Report
 description: Tell us about something that's not working the way we (probably) intend.
+type: Bug
 body:
   - type: dropdown
     id: type