diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 8ce1fa5..dd84ea7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,27 +1,38 @@
 ---
 name: Bug report
-about: Create a report to help us improve GitHub Copilot for Xcode
----
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
 
-<!-- Please search existing issues to avoid creating duplicates -->
+---
 
 **Describe the bug**
-<!-- A clear and concise description of what the bug is. -->
+A clear and concise description of what the bug is.
 
-**Versions**
-- Copilot for Xcode: [e.g. 0.25.0]
-- Xcode: [e.g. 16.0]
-- macOS: [e.g. 14.6.1]
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
 
-**Steps to reproduce**
-1. 
-2. 
+**Expected behavior**
+A clear and concise description of what you expected to happen.
 
 **Screenshots**
-<!-- Add screenshots or screen recordings to help explain your problem. -->
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
 
-**Logs**
-<!-- Attach relevant logs from `~/Library/Logs/GitHubCopilot/` -->
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
 
 **Additional context**
-<!-- Add any other context about the problem here. -->
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md
new file mode 100644
index 0000000..48d5f81
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/custom.md
@@ -0,0 +1,10 @@
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 3f98d70..bbcbbe7 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,8 +1,20 @@
 ---
 name: Feature request
-about: Suggest an idea for GitHub Copilot for Xcode
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
 ---
 
-<!-- Please search existing issues to avoid creating duplicates -->
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
 
-<!-- Describe the feature you'd like. -->
\ No newline at end of file
+**Additional context**
+Add any other context or screenshots about the feature request here.