diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 5ef1390c..5bb78cc2 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -6,9 +6,11 @@ body:
   - type: markdown
     attributes:
       value: |
-          If you see any of the following, go to [Discord](https://discord.gg/pterodactyl) and report your error in a support channel.
-          * `A fatal error was encountered while starting this server.`
-          * `No server egg configuration could be located; aborting startup.`
+        If you see any of the following, go to [Discord](https://discord.gg/pterodactyl) and report your error in a support channel.
+        * `A fatal error was encountered while starting this server.`
+        * `No server egg configuration could be located; aborting startup.`
+
+        Make sure there are no existing bug reports by searching the [repository issues](https://github.com/parkervcp/eggs/issues?q=is%3Aopen+is%3Aissue+label%3ABug).
   - type: input
     id: panel-version
     attributes:
@@ -24,7 +26,7 @@ body:
       description: Version number of your Wings (latest is not a version)
       placeholder: 1.x.x
     validations:
-      required: true      
+      required: true
   - type: input
     id: service
     attributes:
@@ -32,18 +34,18 @@ body:
       description: Service you are experiencing issues with
       placeholder: minecraft/factorio/etc
     validations:
-      required: true          
+      required: true
   - type: dropdown
     id: modified
     attributes:
       label: Modified
       description: Did you add or change things, this includes startup configs/install scripts/variables
       options:
-        -  Yes, I modified the egg (will provide details below)
-        -  No, I did not modify the egg   
+        - Yes, I modified the egg (will provide details below)
+        - No, I did not modify the egg
     validations:
-      required: true 
-  - type: textarea          
+      required: true
+  - type: textarea
     id: expected-behavior
     attributes:
       label: Expected Behavior
@@ -51,7 +53,7 @@ body:
       placeholder: Install the server, start it, play
     validations:
       required: true
-  - type: textarea      
+  - type: textarea
     id: actual-behavior
     attributes:
       label: Actual Behavior
@@ -59,15 +61,15 @@ body:
       placeholder: Server crashed with error X
     validations:
       required: true
-  - type: textarea       
+  - type: textarea
     id: reproduce-steps
     attributes:
       label: Steps To Reproduce
       description: Step by step what to do to cause the issue
       placeholder: |
-       Step 1 Set version to latest
-       Step 2 install
-       Step 3 Receive error X or Y
+        Step 1 Set version to latest
+        Step 2 install
+        Step 3 Receive error X or Y
     validations:
       required: true
   - type: textarea
@@ -75,4 +77,4 @@ body:
     attributes:
       label: Relevant log output
       description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
-      render: shell
\ No newline at end of file
+      render: shell
diff --git a/.github/ISSUE_TEMPLATE/egg-request.yml b/.github/ISSUE_TEMPLATE/egg-request.yml
index 91366078..731f4cfd 100644
--- a/.github/ISSUE_TEMPLATE/egg-request.yml
+++ b/.github/ISSUE_TEMPLATE/egg-request.yml
@@ -1,19 +1,12 @@
 name: 🥚 Egg Request
 description: Suggest a server to build an egg for
 title: "[Egg Request]: "
+labels: [Egg Request]
 body:
   - type: markdown
     attributes:
       value: |
-          Make sure there are no existing egg requests by searching the repository issues. Please understand how Pterodactyl works when you are requesting an egg. (ie. docker-compose doesn't work for a pterodactyl server)
-  - type: input
-    id: service
-    attributes:
-      label: Service
-      description: Service you are experiencing issues with
-      placeholder: minecraft/factorio/etc
-    validations:
-      required: true
+          Make sure there are no existing egg requests by searching the [repository issues](https://github.com/parkervcp/eggs/issues?q=is%3Aissue+is%3Aopen+label%3A%22Egg+Request%22). Please understand how Pterodactyl works when you are requesting an egg. (ie. docker-compose doesn't work for a pterodactyl server)
   - type: dropdown
     id: expand
     attributes:
@@ -26,14 +19,14 @@ body:
   - type: input
     id: game-link
     attributes:
-      label: Link to game
+      label: Link to a game or software
       placeholder: minecraft.net/factorio.com/etc
     validations:
       required: true
   - type: input
     id: download-link
     attributes:
-      label: Links for server downloads
+      label: Links for the download
       description: This needs to be an official link and not one that is hosted on some forum page or a personal Github page.
     validations:
       required: true