diff --git a/.github/ISSUE_TEMPLATE/bugs.md b/.github/ISSUE_TEMPLATE/bugs.md
new file mode 100644
index 00000000..699fe823
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bugs.md
@@ -0,0 +1,18 @@
+---
+name: "\U0001F41B Bug Report"
+about: Create a report for an egg
+
+---
+
+Please fill out the information bellow and remove from the line up
+---------------
+Panel Version: (version number)
+Daemon Version: (version number)
+Service: (minecraft/factorio/etc)
+Modified: (yes/no) (did you add or change things, this includes startup configs/install scripts/variables)
+
+Expected Behavior:
+
+Actual Behavior:
+
+Steps to Reproduce: (Step by step what to do to cause the issue)
\ No newline at end of file
diff --git a/.github/issue_template.md b/.github/ISSUE_TEMPLATE/issue_template.md
similarity index 100%
rename from .github/issue_template.md
rename to .github/ISSUE_TEMPLATE/issue_template.md
diff --git a/.github/ISSUE_TEMPLATE/request.md b/.github/ISSUE_TEMPLATE/request.md
new file mode 100644
index 00000000..80efda55
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/request.md
@@ -0,0 +1,11 @@
+---
+name: "\U0001F3AE Game Request"
+about: Suggest an game to build an egg for
+
+---
+
+Please fill out the information bellow and remove from the line up
+---------------
+Service: (Ex. minecraft/factorio/etc)
+
+Link to game: (Ex. minecraft.net/factorio.com/etc)
\ No newline at end of file