diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 3796d40..59a10f5 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -1,7 +1,8 @@
-name: Bug
-description: File a bug
+# Based on the issue template
+name: Bug report
+description: Create a report to help us improve
 title: "[BUG] <title>"
-labels: [Bug, Needs Triage]
+labels: [Bug]
 body:
   - type: checkboxes
     attributes:
@@ -10,21 +11,18 @@ body:
       options:
         - label: I have searched the existing issues
           required: true
-
   - type: textarea
     attributes:
       label: Current Behavior
       description: Tell us what happens instead of the expected behavior.
     validations:
       required: true
-
   - type: textarea
     attributes:
       label: Expected Behavior
       description: Tell us what should happen.
     validations:
       required: false
-
   - type: textarea
     attributes:
       label: Steps To Reproduce
@@ -34,10 +32,8 @@ body:
         2. With this config...
         3. Run '...'
         4. See error...
-      render: Markdown
     validations:
       required: true
-
   - type: textarea
     attributes:
       label: Environment
@@ -45,15 +41,12 @@ body:
         examples:
           - **OS**: Ubuntu 20.04
           - **How docker service was installed**: distro's packagemanager
-          - **Docker version**: 20.10.17
       value: |
         - OS:
         - How docker service was installed:
-        - **Docker version**:
-      render: Markdown
+      render: markdown
     validations:
       required: false
-
   - type: dropdown
     attributes:
       label: CPU architecture
@@ -63,24 +56,22 @@ body:
         - armhf
     validations:
       required: true
-
   - type: textarea
     attributes:
       label: Docker creation
       description: |
         Command used to create docker container
         Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container
-      render: YAML
+      render: bash
     validations:
       required: true
-
   - type: textarea
     attributes:
       description: |
-        Provide a full docker log, output of "docker logs jellyfin"
-      label: Docker logs
+        Provide a full docker log, output of "docker logs linuxserver.io"
+      label: Container logs
       placeholder: |
-        Output of `docker logs jellyfin`
-      render: Text
+        Output of `docker logs linuxserver.io`
+      render: bash
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
new file mode 100644
index 0000000..ab3304c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -0,0 +1,31 @@
+# Based on the issue template
+name: Feature request
+description: Suggest an idea for this project
+title: "[FEAT] <title>"
+labels: [enhancement]
+body:
+  - type: checkboxes
+    attributes:
+      label: Is there an existing feature request for this?
+      description: Please search to see if an feature request already exists.
+      options:
+        - label: I have searched the existing issues
+          required: true
+  - type: textarea
+    attributes:
+      label: Wanted change
+      description: Tell us what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Reason for change
+      description: Justify your request, why do you want it, what is the benefit.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Proposed code change
+      description: Do you have a potential code change in mind?
+    validations:
+      required: false