diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 8542b7b99..4a776d440 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,9 @@
 ---
 name: Bugs
 about: Crashes and other bugs
-labels: 'bug'
+title: ''
+labels: bug
+assignees: ''
 
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
index 9be069a7a..055a9f24b 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.md
+++ b/.github/ISSUE_TEMPLATE/enhancement.md
@@ -1,13 +1,16 @@
 ---
 name: Enhancements
-about: New functionality
-labels: 'enhancement'
+about: What to merge
+title: ''
+labels: enhancement
+assignees: tmpm697
 
 ---
 
-### Please read the following before submitting:
-- We are not accepting any new window management features unless they get implemented by i3.
+Title: Merge fluix-dev/sway-borders
 
-### Please fill out the following:
-- **Description:**
-Please describe in plain English what the enhancement is and what the use case is.
+Content:
+Fork link: https://github.com/fluix-dev/sway-borders
+PRs link: https://github.com/swaywm/sway/pull/5639
+
+Tag: Enhancements
diff --git a/.github/ISSUE_TEMPLATE/i3_compat.md b/.github/ISSUE_TEMPLATE/i3_compat.md
deleted file mode 100644
index 4dfa21c3c..000000000
--- a/.github/ISSUE_TEMPLATE/i3_compat.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: i3 Compatibility
-about: Sway behaves differently from or lacks i3 functionality
-labels: 'i3-compat'
-
----
-
-### Please read the following before submitting:
-- The following either do not make sense for Wayland or we have decided against supporting:
-  - `restart`
-  - `resource`
-  - saving and loading layouts
-  - the i3 sync protocol
-
-### Please fill out the following:
-- **i3 PR:**
-  - If this is new i3 functionality, please add a link to the i3 pull request.
-
-- **Description:**
-  - Please describe in plain English how Sway and i3's behaviors differ or what functionality Sway is lacking.