diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 773e9f1..da58d50 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -16,20 +16,7 @@ body:
     attributes:
       label: What server version are you running?
       options:
-        - 1.7
-        - 1.8
-        - 1.9
-        - 1.10
-        - 1.11
-        - 1.12
-        - 1.13
-        - 1.14
-        - 1.15
-        - 1.16
-        - 1.17
-        - 1.18
-        - 1.19
-        - 1.20
+        - 1.21
     validations:
      required: true
   - type: dropdown
@@ -38,34 +25,8 @@ body:
       label: What CommandPanels version are you using?
       options:
         - latest
-        - 3.20.0.3
-        - 3.20.0.2
-        - 3.20.0.1
-        - 3.19.0.3
-        - 3.19.0.2
-        - 3.19.0.1
-        - 3.19.0.0
-        - 3.18.6.2
-        - 3.18.6.1
-        - 3.18.6.0
-        - 3.18.5.1
-        - 3.18.5.0
-        - 3.18.4.1
-        - 3.18.4.0
-        - 3.18.3.0
-        - 3.18.2.0
-        - 3.18.1.4
-        - 3.18.1.3
-        - 3.18.1.2
-        - 3.18.1.1
-        - 3.18.1.0
-        - 3.18.0.0
-        - 3.17.5.0
-        - 3.17.4.3
-        - 3.17.4.2
-        - 3.17.4.1
-        - 3.17.4.0
-        - 3.17.3.1
+        - 4.0.5
+        - 4.0.6
         - Any other version
     validations:
      required: true
@@ -74,18 +35,8 @@ body:
     attributes:
       label: What server software are you running?
       options:
-        - PaperMC
+        - Paper
         - Purpur
-        - Spigot
-        - CraftBukkit
-        - Glowstone
-        - Magma
-        - Mohist
-        - WaterFall
-        - BungeeCord
-        - Velocity
-        - Travertine
-        - Other
     validations:
      required: true
   - type: textarea
@@ -93,7 +44,6 @@ body:
     attributes:
       label: What happened?
       description: A clear and concise description of what the bug is.
-      placeholder: Tell us what you see!
       placeholder: "Example: I can't interact with custom furniture if I'm in my own claim"
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index a10928f..d923203 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,4 +2,4 @@ blank_issues_enabled: false
 contact_links:
   - name: Creating issues
     url: https://github.com/rockyhawk64/CommandPanels/issues/new/choose
-    about: When creating issues you must use the templates we made. Removing the template/creating a blank issues will not recieve help.
+    about: When creating issues you must use the templates we made. Removing the template/creating a blank issues will not receive help.
diff --git a/.github/ISSUE_TEMPLATE/need-help.yml b/.github/ISSUE_TEMPLATE/need_help.yml
similarity index 75%
rename from .github/ISSUE_TEMPLATE/need-help.yml
rename to .github/ISSUE_TEMPLATE/need_help.yml
index 478b954..f98d5bf 100644
--- a/.github/ISSUE_TEMPLATE/need-help.yml
+++ b/.github/ISSUE_TEMPLATE/need_help.yml
@@ -16,20 +16,7 @@ body:
     attributes:
       label: What server version are you running?
       options:
-        - 1.7
-        - 1.8
-        - 1.9
-        - 1.10
-        - 1.11
-        - 1.12
-        - 1.13
-        - 1.14
-        - 1.15
-        - 1.16
-        - 1.17
-        - 1.18
-        - 1.19
-        - 1.20
+        - 1.21
     validations:
       required: true
   - type: dropdown
@@ -38,34 +25,8 @@ body:
       label: What CommandPanels version are you using?
       options:
         - latest
-        - 3.20.0.3
-        - 3.20.0.2
-        - 3.20.0.1
-        - 3.19.0.3
-        - 3.19.0.2
-        - 3.19.0.1
-        - 3.19.0.0
-        - 3.18.6.2
-        - 3.18.6.1
-        - 3.18.6.0
-        - 3.18.5.1
-        - 3.18.5.0
-        - 3.18.4.1
-        - 3.18.4.0
-        - 3.18.3.0
-        - 3.18.2.0
-        - 3.18.1.4
-        - 3.18.1.3
-        - 3.18.1.2
-        - 3.18.1.1
-        - 3.18.1.0
-        - 3.18.0.0
-        - 3.17.5.0
-        - 3.17.4.3
-        - 3.17.4.2
-        - 3.17.4.1
-        - 3.17.4.0
-        - 3.17.3.1
+        - 4.0.5
+        - 4.0.6
         - Any other version
     validations:
       required: true