diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml
new file mode 100644
index 0000000..82f4e09
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yaml
@@ -0,0 +1,21 @@
+name: Bug Report
+description: File a bug report
+title: "[It broke]: "
+labels: ["bug"]
+body:
+  - type: textarea
+    attributes:
+      label: What is broken?
+      description: What happened? How did we get here?
+      placeholder: The place where you tell me what you expected to happen, and what happened instead.
+    validations:
+      required: true
+  - type: textarea
+    attributes: 
+      label: Log-output
+      description: The output of `docker logs tranga-api`
+      render: C#
+  - type: textarea
+    attributes: 
+      label: Additional stuff
+      description: Screenshots, anything you think might help
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 949676b..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: "[It broke]"
-labels: bug
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Log output**