diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
new file mode 100644
index 00000000..8d0f2b83
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -0,0 +1,40 @@
+name: Bug Report
+description: File a bug report
+labels:
+  - bug
+  - status/needs triage
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to report a bug.
+        
+        Please double check some things first:
+        - Do you just have a question about something? If so, asking in the 
+          [Q&A Discussions](https://github.com/itzg/docker-minecraft-server/discussions/categories/q-a)
+          or asking on [the Discord server](https://discord.gg/DXfKpjB) would be best.
+        - Is this bug happening after the `[init]` prefixed logs and after the log that says
+          "Starting the Minecraft server"? If so, please report the bug with Mojang or the
+          respective server provider.
+        - Are you seeing a performance problem? If so, that is typically outside the scope of
+          the image setup mechanims. Ask a question as above or contact the respective server
+          provider.
+  - type: textarea
+    id: problem
+    attributes:
+      label: Describe the problem
+    validations:
+      required: true
+  - type: textarea
+    id: container
+    attributes:
+      label: Container definition
+      description: Please provide the compose file or run command used to create the container
+  - type: textarea
+    id: logs
+    attributes:
+      label: Container logs
+      description: |
+        Please provide container logs from the start of the container, which will be the ones
+        prefixed with `[init]`. It is even better if you can set the variable `DEBUG` to "true"
+        and provide those debug container logs.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml
new file mode 100644
index 00000000..efe19488
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -0,0 +1,31 @@
+name: Enhancement Request
+description: Request an enhancement
+labels:
+  - enhancement
+  - status/needs triage
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to request an enhancement.
+        
+        Even if you plan on submitting a pull request with a contributed enhancement it is
+        best to describe the enhancement here first. Somebody might already be working on
+        a similar thing and could use your help.
+  - type: dropdown
+    id: type
+    attributes:
+      label: Enhancement Type
+      options:
+        - Improve an existing feature
+        - A completely new feature
+        - New server type
+        - Not sure
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the enhancement
+    validations:
+      required: true
\ No newline at end of file