diff --git a/.github/ISSUE_TEMPLATE/1-Feature_request.md b/.github/ISSUE_TEMPLATE/1-Feature_request.md
deleted file mode 100644
index e67e1e79..00000000
--- a/.github/ISSUE_TEMPLATE/1-Feature_request.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: Feature request
-about: "You want something added to the app \U0001F389"
-title: ""
-labels: enhancement
-assignees: ""
----
diff --git a/.github/ISSUE_TEMPLATE/1-feature-request.yml b/.github/ISSUE_TEMPLATE/1-feature-request.yml
new file mode 100644
index 00000000..866c0d8d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1-feature-request.yml
@@ -0,0 +1,34 @@
+name: Feature Request
+description: You want something added to the app \U0001F389
+labels: [enhancement]
+projects: [SwitchbackTech/4]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature request!
+
+  - type: input
+    attributes:
+      label: Feature Title
+      description: Provide a short and descriptive title for the feature request.
+      placeholder: Add Fancy New Thing
+
+  - type: textarea
+    attributes:
+      label: Feature Description
+      description: Describe the feature you would like to see added.
+      placeholder: New Thing should work like this ...
+
+  - type: textarea
+    attributes:
+      label: Use Case
+      description: Explain the use case for this feature. How will it benefit users?
+      placeholder: This'll save users time by ...
+
+  - type: textarea
+    attributes:
+      label: Additional Context
+      description: Add any other context or screenshots about the feature request here.
+      placeholder: Here's where I got this idea ...
diff --git a/.github/ISSUE_TEMPLATE/2-Bug_report.md b/.github/ISSUE_TEMPLATE/2-Bug_report.md
deleted file mode 100644
index 0016f3aa..00000000
--- a/.github/ISSUE_TEMPLATE/2-Bug_report.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-name: Bug report
-about: "Report technical issues. \U0001F41E"
-title: ""
-labels: bug
-assignees: ""
----
-
-## Prerequisites
-
-- [ ] Using an up-to-date main branch
-
-## Expected Behavior
-
-<!--- What should have happened? -->
-
-## Current Behavior
-
-<!--- What went wrong? -->
-
-## Steps to Reproduce
-
-<!-- Add relevant code and/or a live example -->
-<!-- Add stack traces -->
-
-1.
-
-2.
-
-3.
-
-4.
-
-## Possible Solution (Not obligatory)
-
-<!--- Suggest a reason for the bug or how to fix it. -->
-
-## Context
-
-<!--- How has this issue affected users? What are they trying to accomplish? -->
diff --git a/.github/ISSUE_TEMPLATE/2-bug-report.yml b/.github/ISSUE_TEMPLATE/2-bug-report.yml
new file mode 100644
index 00000000..262dbca2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2-bug-report.yml
@@ -0,0 +1,48 @@
+name: Bug Report
+description: Report technical issues. \U0001F41E
+labels: [bug]
+projects: [SwitchbackTech/4]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+
+  - type: dropdown
+    attributes:
+      label: Where did this happen?
+      multiple: true
+      options:
+        - Production app
+        - Local code with an up-to-date main branch
+
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: What should have happened?
+      placeholder: Describe the expected behavior...
+
+  - type: textarea
+    attributes:
+      label: Current Behavior
+      description: What went wrong?
+      placeholder: Describe the current behavior...
+
+  - type: textarea
+    attributes:
+      label: Steps to Reproduce
+      description: Include a step-by-step guide, along with any stack traces, screenshots, or screen recordings.
+      placeholder: "1.\n\n2.\n\n3.\n\n4."
+
+  - type: textarea
+    attributes:
+      label: Possible Solution
+      description: Suggest a reason for the bug or how to fix it.
+      placeholder: If you already know how we could solve this, describe it here...
+
+  - type: textarea
+    attributes:
+      label: Context
+      description: How has this issue affected users? What are they trying to accomplish?
+      placeholder: Describe the context...
diff --git a/.github/ISSUE_TEMPLATE/3-DevOps.md b/.github/ISSUE_TEMPLATE/3-DevOps.md
deleted file mode 100644
index a3c4133b..00000000
--- a/.github/ISSUE_TEMPLATE/3-DevOps.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: DevOps
-about: You want to make our processes better ⚙️
-title: ""
-labels: ""
-assignees: ""
----
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 3d689d7c..027b3060 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,4 +1,4 @@
 # Code of Conduct 🤝
 
 The Compass Code of Conduct is available on the official doc:
-[https://docs.compasscalendar.com/docs/CodeOfConduct](https://docs.compasscalendar.com/docs/CodeOfConduct)
+[https://docs.compasscalendar.com/docs/code-of-conduct](https://docs.compasscalendar.com/docs/code-of-conduct)
diff --git a/SECURITY.md b/SECURITY.md
index ecc85b89..9cc0e0f6 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,12 +2,12 @@
 
 ## Reporting a Vulnerability
 
-If you discover a security vulnerability in this project, please send an email to **tyler@switchback.tech** with the following details:  
+If you discover a security vulnerability in this project, please send an email to **tyler@switchback.tech** with the following details:
 
-- A description of the vulnerability  
-- Steps to reproduce (if applicable)  
-- Any relevant logs, screenshots, or details that can help in identifying the issue  
+- A description of the vulnerability
+- Steps to reproduce (if applicable)
+- Any relevant logs, screenshots, or details that can help in identifying the issue
 
-**Please do not disclose the vulnerability publicly until it has been addressed.**  
+**Please do not disclose the vulnerability publicly until it has been addressed.**
 
-I will make every effort to respond within 48 hours and provide a timeline for a fix. Thank you for helping to keep this project secure!  
+I will make every effort to respond within 48 hours and provide a timeline for a fix. Thank you for helping to keep this project secure!