diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..8dc3de9b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,19 @@
+## Problem Statement
+
+<!--[Linear issue](#)-->
+<!--PR Branch Name: `xxx`-->
+
+<!--Describe the problem here in the most concise way possible-->
+
+## Resolution Criteria
+
+<!--What will be true when this issue is resolved?-->
+
+## How to reproduce
+
+<!--Describe process or steps to reproduce the error-->
+
+## Screenshots/Recordings
+
+<!--Clearly show the issue with screen captures-->
+
diff --git a/.github/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from .github/pull_request_template.md
rename to .github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/issue_template.md b/.github/issue_template.md
deleted file mode 100644
index 754a2792..00000000
--- a/.github/issue_template.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## What's the Problem?
-
-<!--Remove if there's no Basecamp item-->
-
-[Basecamp item](#)
-
-<!--Describe the problem here in the most concise way possible-->
-
-## Steps to reproduce
-
--
--
-
-## Screenshots/Recordings
-