diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 43f7e236..4d4f55c9 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -26,25 +26,6 @@ body:
                     required: true
                 -   label: I've searched for similar issues in [the discussions](https://github.com/kevinpapst/kimai2/discussions).
                     required: true
-    -   type: textarea
-        id: reproducer
-        attributes:
-            label: Steps to reproduce the behavior
-            value: |
-                1. Go to '...'
-                2. Scroll down to '...'
-                3. Click on '...'
-                4. See error
-    -   type: textarea
-        id: expected
-        attributes:
-            label: Expected behavior
-            description: A clear and concise description of what you expected to happen.
-    -   type: textarea
-        id: screenshots
-        attributes:
-            label: Screenshots
-            description: If applicable, add screenshots to better explain your problem.
     -   type: input
         id: version
         attributes:
@@ -53,6 +34,18 @@ body:
             placeholder: 1.xx.x
         validations:
             required: true
+    -   type: dropdown
+        id: php
+        attributes:
+            label: Which PHP version are you using?
+            options:
+                - "7.3"
+                - "7.4"
+                - "8.0"
+                - "8.1"
+                - Other (please mention below)
+        validations:
+            required: true
     -   type: dropdown
         id: installation
         attributes:
@@ -61,21 +54,33 @@ body:
                 - kimai.cloud service
                 - Self-Hosted
                 - Synology
-                - Other
+                - Other (please mention below)
         validations:
             required: true
+    -   type: textarea
+        id: reproducer
+        attributes:
+            label: Steps to reproduce the behavior
+            value: |
+                1. Go to '...'
+                2. Scroll down to '...'
+                3. Click on '...'
+                4. See error
     -   type: textarea
         id: logs
         attributes:
             label: Logfile
             description: Please paste the last lines from your logfile at "var/log/prod.log" or "Doctor > Logs", around the time when the problem happened.
+    -   type: textarea
+        id: screenshots
+        attributes:
+            label: Screenshots
+            description: If applicable, add screenshots to better explain your problem.
     -   type: textarea
         id: additional
         attributes:
             label: Additional context
             description: Add any other context about the problem here.
             value: |
-                Kimai version: ?.?
-                PHP version: ?.?
                 Device: [Ubuntu Laptop 16 inch, Windows Desktop 27 inch, iPhone 6s]
                 Browser [e.g. Firefox 81, Chrome 85, Safari 14]
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index b8383910..41e28813 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -13,7 +13,6 @@ body:
             description: >
                 Is your feature request related to a problem? If so, please provide
                 a clear and concise description of what the issue is.
-                Ex. I'm always frustrated when [...]
         validations:
             required: true
     -   type: textarea
@@ -33,8 +32,3 @@ body:
         attributes:
             label: Screenshots
             description: If applicable, add screenshots to better explain your problem.
-    -   type: textarea
-        id: additional
-        attributes:
-            label: Additional context
-            description: Add any other context about the problem here.