diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.yml
similarity index 90%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to .github/ISSUE_TEMPLATE/bug_report.yml
index a3844fbd..0c4fe848 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,6 @@
 name: Bug report
 description: Create a report to help us improve Kimai
-labels: bug
+labels: ["bug"]
 body:
 - type: markdown
   attributes:
@@ -45,6 +45,14 @@ body:
   attributes:
   label: Screenshots
   description: If applicable, add screenshots to better explain your problem.
+- type: input
+  id: version
+  attributes:
+  label: Kimai version
+  description: Which version of Kimai are you running (check Doctor or About screen)
+  placeholder: 1.xx.x
+  validations:
+  required: true
 - type: dropdown
   id: installation
   attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.yml
similarity index 97%
rename from .github/ISSUE_TEMPLATE/feature_request.md
rename to .github/ISSUE_TEMPLATE/feature_request.yml
index 63f18f18..e53b8358 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,6 +1,6 @@
 name: Feature request
 description: Suggest an idea to make Kimai better
-labels: feature request
+labels: ["feature request"]
 body:
 - type: markdown
   attributes: