diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 398af0f..432a7cf 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,9 +1,5 @@
-blank_issues_enabled: false
-contact_links:
+Choose a PR template:
 
-- name: Default Pull Request
-  url: .github/PULL_REQUEST_TEMPLATE/default.md
-  about: For general changes and updates
-- name: Data Update Pull Request
-  url: .github/PULL_REQUEST_TEMPLATE/data_update.md
-  about: For game data updates and modifications
+* [General]("?expand=1&template=.github/PULL_REQUEST_TEMPLATE/default.md"): For general changes like feature additions
+  and issue resolution
+* [Data Update]("?expand=1&template=.github/PULL_REQUEST_TEMPLATE/data_update.md"): For game data updates
diff --git a/.github/PULL_REQUEST_TEMPLATE/data_update.md b/.github/PULL_REQUEST_TEMPLATE/data_update.md
index aae8f06..3e5cfd0 100644
--- a/.github/PULL_REQUEST_TEMPLATE/data_update.md
+++ b/.github/PULL_REQUEST_TEMPLATE/data_update.md
@@ -1,68 +1,46 @@
-name: Data Update
-description: For game data updates and modifications
-body:
+# Data Update
 
-- type: markdown
-  attributes:
-  value: |
-  ## Data Update
-- type: textarea
-  id: summary
-  attributes:
-  label: Summary
-  description: Describe what this data update includes
-  placeholder: "Adding new Valentines 2024 characters"
-  validations:
-  required: true
-- type: textarea
-  id: new-additions
-  attributes:
-  label: New Additions
-  description: List new items being added, grouped by type
-  value: |
-  ##### Characters
-  -
-  ##### Weapons
-  -
-  ##### Summons
-  -
-- type: textarea
-  id: modifications
-  attributes:
-  label: Modifications
-  description: List existing items being modified
-  value: |
-  ##### Characters
-  -
-  ##### Weapons
-  -
-  ##### Summons
-  -
-- type: textarea
-  id: csv-files
-  attributes:
-  label: CSV Files Added
-  description: List all CSV files included in this update
-  value: |
-    - [ ] `YYYYMMDD-characters-XXX.csv`
-    - [ ] `YYYYMMDD-weapons-XXX.csv`
-    - [ ] `YYYYMMDD-summons-XXX.csv`
-- type: checkboxes
-  id: data-checklist
-  attributes:
-  label: Checklist
-  options:
-    - label: CSV files use the correct naming format (`YYYYMMDD-{type}-XXX.csv`)
-    - label: CSV files are in the correct location (`db/seed/updates/`)
-    - label: All required fields are filled out
-    - label: Dates use the correct format (`YYYY-MM-DD`)
-    - label: Boolean values are either `true` or `false`
-    - label: Arrays use the correct format (e.g., `{value1,value2}`)
-    - label: Ran import in test mode (`bin/rails granblue:import_data TEST=true`)
-- type: textarea
-  id: test-results
-  attributes:
-  label: Test Results
-  description: Paste the output from running the import in test mode
-  validations:
-  required: true
+## Summary
+
+<!-- Describe what this data update includes -->
+<!-- Example: Adding new Valentines 2024 characters -->
+
+## New Additions
+
+<!-- Copy the list of newly added items from the Import Summary -->
+
+##### Characters
+- 
+
+##### Weapons
+- 
+
+##### Summons
+- 
+
+## Modifications
+
+<!-- Copy the list of modified items from the Import Summary -->
+
+##### Characters
+- 
+
+##### Weapons
+- 
+
+##### Summons
+-
+
+## Checklist
+
+- [ ] CSV files use the correct naming format (`YYYYMMDD-{type}-XXX.csv`)
+- [ ] CSV files are in the correct location (`db/seed/updates/`)
+- [ ] All required fields are filled out
+- [ ] Dates use the correct format (`YYYY-MM-DD`)
+- [ ] Boolean values are either `true` or `false`
+- [ ] Arrays use the correct format (e.g., `{value1,value2}`)
+- [ ] Ran import in test mode (`bin/rails granblue:import_data TEST=true`)
+
+## Test Results
+
+<!-- Paste the completion section from running the import in test mode -->
diff --git a/.github/PULL_REQUEST_TEMPLATE/default.md b/.github/PULL_REQUEST_TEMPLATE/default.md
index a2616ba..e723b33 100644
--- a/.github/PULL_REQUEST_TEMPLATE/default.md
+++ b/.github/PULL_REQUEST_TEMPLATE/default.md
@@ -1,26 +1,21 @@
-name: Default Pull Request
-description: For general changes and updates
-body:
+# Pull Request
 
-- type: markdown
-  attributes:
-  value: |
-  ## Description
-  Please provide a clear description of your changes.
-- type: textarea
-  id: changes
-  attributes:
-  label: Changes Made
-  description: List the main changes in this PR
-  placeholder: "- Added feature X\n- Fixed bug Y\n- Updated documentation for Z"
-  validations:
-  required: true
-- type: checkboxes
-  id: checks
-  attributes:
-  label: Checklist
-  options:
-    - label: I have tested my changes
-    - label: I have updated relevant documentation
-    - label: My changes generate no new warnings
-    - label: I have added tests if applicable
+## Description
+
+Please provide a clear description of your changes.
+
+## Changes Made
+
+<!-- List the main changes in this PR -->
+<!-- Example:
+- Added feature X
+- Fixed bug Y
+- Updated documentation for Z
+-->
+
+## Checklist
+
+- [ ] I have tested my changes
+- [ ] I have updated relevant documentation
+- [ ] My changes generate no new warnings
+- [ ] I have added tests if applicable