diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..81062eff8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,23 @@
+---
+name: 🐛 Bug report
+about: Report unexpected behavior that interferes with app functionality
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+Describe what the bug is, and how it should be changed.
+
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. 
+
+**Environment**
+Where was the bug encountered?
+ - [ ] Staging
+ - [ ] Production
+OS: [e.g. iOS]
+Browser: [e.g. chrome, safari]
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
deleted file mode 100644
index d241cf918..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-name: 🐛 Bug report
-description: Create a report to help us improve
-labels: bug
-body:
-  - type: textarea
-    id: bug-description
-    attributes:
-      label: "Bug Description"
-      description: "A clear and concise description of what the bug is. Please add screenshots if you have as they usually help us a lot."
-      placeholder: "Describe the bug here..."
-    validations:
-      required: true
-  - type: textarea
-    id: reproduce-steps
-    attributes:
-      label: "Steps to Reproduce"
-      description: "Steps to reproduce the behavior:"
-      placeholder: "1. Go to '...'\n2. Click on '...'\n3. Scroll down to '...'\n4. See error"
-    validations:
-      required: true
-  - type: textarea
-    id: expected-behavior
-    attributes:
-      label: "Expected Behavior"
-      description: "A clear and concise description of what you expected to happen."
-      placeholder: "Describe what you expected to happen here..."
-    validations:
-      required: true
-  - type: input
-    id: app-version
-    attributes:
-      label: "App Version"
-      description: "Please provide the version of the app you are using."
-      placeholder: "e.g. 1.12.0"
-    validations:
-      required: true
-  - type: dropdown
-    id: platform
-    attributes:
-      label: "Platform"
-      description: "Select the platform where the bug occurs."
-      options:
-        - Android (PlayStore)
-        - Android (F-Droid)
-        - Android (Other)
-        - iOS (iPhone)
-        - iOS (iPad)
-        - Web (Chrome(ium))
-        - Web (Firefox)
-        - Web (Safari)
-        - Linux (Snap)
-        - Linux (Flatpak)
-        - Linux (Other)
-        - macOS (iOS/iPadOS version)
-        - macOS (Self-compiled)
-        - Windows (Self-compiled)
-    validations:
-      required: true
-  - type: input
-    id: platform-info
-    attributes:
-      label: "Additional Platform Information"
-      description: "Please provide the following information:"
-      placeholder: "Device: [e.g. iPhone6, PC, Pixel 3]\nOS: [e.g. iOS, Android, Windows, Linux, macOS]\nBrowser (if applicable): [e.g. Chrome, Safari]"
-    validations:
-      required: true
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: "Additional Context"
-      description: "Add any other context about the problem here."
-    validations:
-      required: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..538764aba
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,19 @@
+---
+name: 💡 Feature Request
+about: Suggest a feature to add to Pangea Chat
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Proposed Feature**
+Describe the feature that should be added.
+
+
+**Rationale**
+Explain how the feature would improve the user experience.
+
+
+**To Test**
+After implementation, include a list of changes to be looked over
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
deleted file mode 100644
index 4007c8837..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: 💡 Feature Request
-description: Suggest an idea for this project
-labels: enhancement
-body:
-  - type: textarea
-    id: feature-description
-    attributes:
-      label: "Feature Description"
-      description: "Provide a clear and concise description of the feature."
-      placeholder: "Describe the feature here..."
-    validations:
-      required: true
-  - type: textarea
-    id: rationale
-    attributes:
-      label: "Rationale"
-      description: "Explain why this feature should be added."
-      placeholder: "Describe the rationale for the feature here..."
-    validations:
-      required: true
-  - type: textarea
-    id: mockup
-    attributes:
-      label: "Mockup"
-      description: "If applicable, add any visual mock-ups of the feature."
-    validations:
-      required: false
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: "Additional Context"
-      description: "Add any other context or screenshots about the feature request here."
-    validations:
-      required: false
diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md
new file mode 100644
index 000000000..92cab29b4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/other.md
@@ -0,0 +1,8 @@
+---
+name: Other
+about: Minor appearance tweaks, or other changes that don't qualify as bugs or features
+title: ''
+labels: ''
+assignees: ''
+
+---