From ff5187406a8c174bb826ebc8fda20c3b9359f654 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Thu, 8 Jan 2026 08:55:55 -0500
Subject: [PATCH] Introduce a new issue type for feature removals

---
 .github/ISSUE_TEMPLATE/06-deprecation.yaml    | 16 ++++++++++-----
 .../ISSUE_TEMPLATE/07-feature_removal.yaml    | 20 +++++++++++++++++++
 2 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/07-feature_removal.yaml

diff --git a/.github/ISSUE_TEMPLATE/06-deprecation.yaml b/.github/ISSUE_TEMPLATE/06-deprecation.yaml
index 8a8e29b27..99c64ba24 100644
--- a/.github/ISSUE_TEMPLATE/06-deprecation.yaml
+++ b/.github/ISSUE_TEMPLATE/06-deprecation.yaml
@@ -1,20 +1,26 @@
 ---
-name: 🗑️ Deprecation
+name: ⚠️ Deprecation
 type: Deprecation
-description: The removal of an existing feature or resource
+description: Designation of a feature or behavior that will be removed in a future release
 labels: ["netbox", "type: deprecation"]
 body:
   - type: textarea
     attributes:
-      label: Proposed Changes
+      label: Deprecated Functionality
       description: >
-        Describe in detail the proposed changes. What is being removed?
+        Describe the feature(s) and/or behavior that is being flagged for deprecation.
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Scheduled removal
+      description: In what future release will the deprecated functionality be removed?
     validations:
       required: true
   - type: textarea
     attributes:
       label: Justification
-      description: Please provide justification for the proposed change(s).
+      description: Please provide justification for the deprecation.
     validations:
       required: true
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/07-feature_removal.yaml b/.github/ISSUE_TEMPLATE/07-feature_removal.yaml
new file mode 100644
index 000000000..c6ed9e7bc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/07-feature_removal.yaml
@@ -0,0 +1,20 @@
+---
+name: 🗑️ Feature Removal
+type: Deprecation
+description: The removal of a deprecated feature or resource
+labels: ["netbox", "type: removal"]
+body:
+  - type: input
+    attributes:
+      label: Deprecation Issue
+      description: Specify the issue in which this deprecation was announced.
+      placeholder: "#1234"
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Summary of Changes
+      description: >
+        List all changes necessary to remove the deprecated feature or resource.
+    validations:
+      required: true