diff --git a/.github/ISSUE_TEMPLATE/01-feature.yml b/.github/ISSUE_TEMPLATE/01-feature.yml
deleted file mode 100644
index 767fe7ae2b..0000000000
--- a/.github/ISSUE_TEMPLATE/01-feature.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: 💡 Feature Request
-description: Suggest an idea for improving Sentry CLI
-labels: ["CLI", "Feature"]
-body:
-  - type: textarea
-    id: problem
-    attributes:
-      label: Problem Statement
-      description: What problem could CLI solve that it currently doesn't?
-      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: false
-
-  - 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/02-bug.yml b/.github/ISSUE_TEMPLATE/02-bug.yml
index 1f40d9dad4..7652b7aeda 100644
--- a/.github/ISSUE_TEMPLATE/02-bug.yml
+++ b/.github/ISSUE_TEMPLATE/02-bug.yml
@@ -1,7 +1,37 @@
 name: 🐞 Bug Report
-description: Report a bug in Sentry CLI
+description: Report a bug in the legacy Sentry CLI
 labels: ["CLI", "Bug"]
 body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to report a bug! Before you continue, please try the [new Sentry CLI](https://cli.sentry.dev/). This legacy `sentry-cli` is no longer under active development.
+
+        If you find a bug in the new CLI, please [report it in the new CLI repository](https://github.com/getsentry/cli/issues/new). We will still consider bugs reported here when a blocker prevents you from adopting the new CLI.
+
+  - type: checkboxes
+    id: tried-new-cli
+    attributes:
+      label: Have you tried the new Sentry CLI?
+      options:
+        - label: I have tried the new Sentry CLI.
+          required: true
+  - type: checkboxes
+    id: adoption-blocker
+    attributes:
+      label: Is something blocking adoption of the new CLI?
+      options:
+        - label: I encountered a blocker that prevents me from adopting the new Sentry CLI.
+          required: true
+  - type: textarea
+    id: migration-blocker
+    attributes:
+      label: What is blocking your migration?
+      description: Tell us what makes adopting the new CLI impossible or infeasible for you. This does not have to be a bug in either CLI.
+      placeholder: Describe the missing capability, compatibility requirement, environment constraint, or other blocker.
+    validations:
+      required: true
+
   - type: markdown
     attributes:
       value: |