diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 25c9ffd2..325cff7e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,6 @@
-name: "Bug Report"
+name: "Bug report"
 description: Report an issue or possible bug
-title: ""
+title: "Bug report: "
 labels: ["bug"]
 assignees: []
 body:
@@ -25,22 +25,14 @@ body:
       required: true
   - type: input
     attributes:
-      label: Java version
+      label: Java version (if applicable)
+  - type: textarea
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is, optionally including a screenshot.
     validations:
       required: true
   - type: textarea
     attributes:
-      label: Describe the Bug
-      description: A clear and concise description of what the bug is.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Steps to Reproduce
+      label: Steps to reproduce the bug
       description: Describe the steps taken or paste/link a minimal code example that we can reproduce ourselves.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Screenshots (Optional)
-      description: Link or drag & drop images showcasing the bug.