diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
deleted file mode 100644
index 9eb4f1ef3..000000000
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ /dev/null
@@ -1,61 +0,0 @@
----
-name: Bug report
-about: An error that happens in the plugin.
-title: ''
-labels: ''
-assignees: ''
-
----
-<!--                          !!! README !!!
-
-Please check if there are already similar issues open, also please test if your issue
- isn't already fixed by trying the latest development build:
- https://ci.minebench.de/job/ChestShop-3/
- 
--->
-
-#### Plugin Version
-<!-- The full plugin version that you are running from /version ChestShop -->
- 
- 
-#### Plugin Config
-<!-- The full config.yml file of ChestShop. -->
-<details>
-  <summary>Config</summary>
-  
- ```yaml
- [Put the config here]
- ```
- 
- </details>
- 
-#### Server Version
-<!-- The full server version that you are running from /version -->
- 
- 
-#### Server Log
-<!-- The full latest.log file, especially important if you have a stack trace -->
-<details>
-  <summary>Log</summary>
-
-```
-[Your log here]
-```
-
-</details>
-
-#### What other plugins are you running?
-<!-- List of your plugins, ideally with the version -->
-
-
-#### What is happening?
-<!-- Explain what happens and what steps should be done to reproduce the issue. Ideally with pictures and the full error log! -->
-
-
-#### What did you expect to happen?
-<!-- Explain what you expected to happen after performing the previously described steps -->
-
-
-#### Additional context
-<!-- Add any other context or screenshots about the feature request here. -->
-
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 000000000..706c972bc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,90 @@
+name: Bug report
+description: Report an error that happens in the plugin.
+labels: []
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please check if there are already similar issues open, also please test if your issue
+        isn't already fixed by trying the latest development build: https://ci.minebench.de/job/ChestShop-3/
+
+  - type: textarea
+    attributes:
+      label: What is happening?
+      description: Explain what happens and what steps should be done to reproduce the issue. Ideally with pictures and the full error log!
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: What did you expect to happen?
+      description: Explain what you expected to happen after performing the previously described steps
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Plugin Version
+      description: The full plugin version that you are running from `/version ChestShop`
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Plugin Config
+      description: The full `config.yml` file of ChestShop.
+      value:  |
+        <details>
+          <summary>Config</summary>
+
+         ```yaml
+         [Put the config here]
+         ```
+
+        </details>
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Server Version
+      description: The full server version that you are running from `/version`.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Server Log
+      description: The full `latest.log` file, especially important if you have a stack trace
+      value: |
+        <details>
+          <summary>Log</summary>
+
+          ```
+          [Your log here]
+          ```
+
+        </details>
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: What other plugins are you running?
+      description: List of your plugins, ideally with the version
+    validations:
+      required: true
+
+  - type: checkboxes
+    attributes:
+      label: Agreements
+      description: Please agree to the following.
+      options:
+        - label: I have checked if there are already similar issues open.
+          required: true
+        - label: I am running the latest build available from https://ci.minebench.de/job/ChestShop-3/.
+          required: true
+        - label: I am running a version that has support for the type of issue.
+          required: true
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
deleted file mode 100644
index 021c4a432..000000000
--- a/.github/ISSUE_TEMPLATE/enhancement.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-name: Enhancement
-about: Request a feature or suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: ''
-
----
-<!--                          !!! README !!!
-
-Please check if there are already similar issues open, also please test if your request
- isn't already implement by trying the latest development build:
- https://ci.minebench.de/job/ChestShop-3/
- 
--->
-
-#### Is your feature request related to a problem? Please describe.
-<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when... -->
-
-
-#### Describe the solution you'd like
-<!-- A clear and concise description of what you want to happen. -->
-
-
-#### Describe alternatives you've considered
-<!-- A clear and concise description of any alternative solutions or features you've considered. -->
-
-
-#### Additional context
-<!-- Add any other context or screenshots about the feature request here. -->
-
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml
new file mode 100644
index 000000000..40ec7874a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -0,0 +1,43 @@
+name: Enhancement
+description: Request a feature or suggest an idea for this project
+labels: [enhancement]
+body:
+  - type: markdown
+    attributes:
+      value: |
+       Please check if there are already similar issues open, also please test if your request
+       isn't already implemente by trying the latest development build: https://ci.minebench.de/job/ChestShop-3/
+
+  - type: textarea
+    attributes:
+      label: Is your feature request related to a problem? Please describe.
+      description: A clear and concise description of what the problem is. Ex. I'm always frustrated when...
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Describe the solution you'd like
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered.
+
+  - type: checkboxes
+    attributes:
+      label: Agreements
+      description: Please agree to the following.
+      options:
+        - label: I have checked if there are already similar issues open.
+          required: true
+        - label: I have checked that the latest build doesn't already implement the feature.
+          required: true
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.