diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..a065cd2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,16 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug, up-for-grabs
+assignees: ''
+---
+
+## What is the bug?
+```A clear and concise description of what the bug is and what you would expect to happen```
+
+## How to reproduce?
+```Please provide detailed steps on how to reproduce the bug.```
+
+
+## Screenshots
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..8c069c6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,14 @@
+---
+name: Feature request
+about: Suggest an idea
+title: ''
+labels: enhancement, up-for-grabs
+assignees: ''
+
+---
+
+## What is the current situation?
+
+
+## What is the proposed change?
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..61df5c5
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,5 @@
+Fixes #[issue_no]
+
+# Summary of changes
+
+< Please provide a sensible summary of changes for this pull request, ensuring all changes are explained. >
diff --git a/CHANGELOG.md b/CHANGELOG.md
index af93158..6db0b68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 3. Enhancement - Added auto-updates - thanks to @awdev1
 4. Enhancement - Added MacOS support - thanks to @awdev1
 5. Enhancement - Updated user instructions for MacOS - thanks to @aidenbok203
+6. Enhancement - Added issue and PR templates - thanks to @aidenbok203
 
 # Version 2.5.0
 1. Enhancement - Added new airports - thanks to @aidenbok203